=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-09-29 21:05:46 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-10-01 07:04:49 +0000
@@ -187,7 +187,7 @@
         {
             IdentifiableObject item = queryItem.getItem();
             
-            grid.addHeader( new GridHeader( item.getName(), item.getUid() ) );
+            grid.addHeader( new GridHeader( item.getUid(), item.getName() ) );
         }
 
         // ---------------------------------------------------------------------

=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-09-29 21:05:46 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-10-01 07:04:49 +0000
@@ -206,6 +206,10 @@
     // Supportive methods
     // -------------------------------------------------------------------------
 
+    /**
+     * Returns the dynamic select columns. Dimensions come first and query items
+     * second.
+     */
     private String getSelectColumns( EventQueryParams params )
     {
         String sql = "";
@@ -267,11 +271,11 @@
             sql += "and ps = '" + params.getProgramStage().getUid() + "' ";
         }
 
-        for ( QueryItem filter : params.getItems() )
+        for ( QueryItem item : params.getItems() )
         {
-            if ( filter.hasFilter() )
+            if ( item.hasFilter() )
             {                
-                sql += "and lower(" + filter.getItem().getUid() + ") " + filter.getSqlOperator() + " " + getSqlFilter( filter ) + " ";
+                sql += "and lower(" + item.getItem().getUid() + ") " + item.getSqlOperator() + " " + getSqlFilter( item ) + " ";
             }
         }
         
@@ -286,6 +290,9 @@
         return sql;
     }
     
+    /**
+     * Returns the filter value for the given query item.
+     */
     private String getSqlFilter( QueryItem item )
     {
         String operator = item.getOperator();