=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2013-01-17 14:26:35 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2013-01-17 14:59:00 +0000
@@ -180,9 +180,11 @@
     /**
      * Returns the index of the indicator dimension in the dimension map.
      */
-    public int getIndicatorDimensionIndex()
+    public int getDataElementOrIndicatorDimensionIndex()
     {
-        return getAllDimensionNamesAsList().indexOf( INDICATOR_DIM_ID );
+        List<String> dims = getAllDimensionNamesAsList();
+        
+        return dims.contains( DATAELEMENT_DIM_ID ) ? dims.indexOf( DATAELEMENT_DIM_ID ) : dims.indexOf( INDICATOR_DIM_ID );
     }
     
     /**

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-01-17 14:26:35 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java	2013-01-17 14:59:00 +0000
@@ -133,7 +133,7 @@
         {         
             Map<String, Double> constantMap = constantService.getConstantMap();
 
-            int indicatorIndex = params.getIndicatorDimensionIndex();
+            int indicatorIndex = params.getDataElementOrIndicatorDimensionIndex();
             
             DataQueryParams dataSourceParams = setDataElementsFromIndicators( params );