=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2015-08-31 07:42:50 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2015-08-31 07:45:43 +0000
@@ -747,11 +747,10 @@
 
         for ( NameableObject element : dataElements )
         {
-            DataElement de = (DataElement) element;
-
-            DataType dataType = DataElement.VALUE_TYPE_STRING.equals( de.getType() ) ? DataType.TEXT : DataType.NUMERIC;
-
-            map.putValue( dataType, de );
+            DataElement dataElement = (DataElement) element;
+            DataType dataType = dataElement.getValueType().isText() ? DataType.TEXT : DataType.NUMERIC;
+
+            map.putValue( dataType, dataElement );
         }
 
         return map;