=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2015-06-10 20:22:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/addDataSet.vm	2015-06-15 06:40:45 +0000
@@ -14,7 +14,7 @@
     checkValueIsExist("code", "validateDataSet.action");
 
     $('#deAvailable').selected({
-      url: '../api/dataElements.json',
+      url: '../api/dataElements.json?filter=domainType:eq:AGGREGATE',
       target: $('#deSelected'),
       search: $('#deAvailableSearch'),
       iterator: 'dataElements'

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2015-06-10 20:22:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/editDataSet.vm	2015-06-15 06:40:45 +0000
@@ -18,7 +18,7 @@
     });
 
     $('#deAvailable').selected({
-      url: '../api/dataElements.json',
+      url: '../api/dataElements.json?filter=domainType:eq:AGGREGATE',
       target: $('#deSelected'),
       search: $('#deAvailableSearch'),
       iterator: 'dataElements'