=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-12-23 16:16:42 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2013-12-23 16:25:40 +0000
@@ -1073,35 +1073,6 @@
 */
 dhis2.de.getCategories = function( dataSetId )
 {
-	/**
-	* Returns markup for drop down boxes to be put in the selection box for the
-	* given categories. The empty string is returned if no categories are given. 
-	*/
-	dhis2.de.getAttributesMarkup = function()
-	{
-		var html = '';
-		
-		if ( !dhis2.de.currentCategories || dhis2.de.currentCategories.length == 0 ) {
-			return html;
-		}
-		
-		$.safeEach( dhis2.de.currentCategories, function( idx, category ) {
-			html += '<div class="selectionBoxRow">';
-			html += '<div class="selectionLabel">' + category.name + '</div>&nbsp;';
-			html += '<select id="category-' + category.id + '" class="selectionBoxSelect" onchange="dhis2.de.attributeSelected(\'' + category.id + '\')">';
-			html += '<option value="-1">[ ' + i18n_select_option + ' ]</option>';
-			
-			$.safeEach( category.options, function( idx, option ) {
-				html += '<option value="' + option.id + '">' + option.name + '</option>';
-			} );
-			
-			html += '</select>';
-			html += '</div>';
-		} );
-
-		return html;
-	};
-
 	var dataSet = dhis2.de.dataSets[dataSetId];
 	
 	if ( !dataSet || !dataSet.categoryCombo || dhis2.de.defaultCategoryCombo === dataSet.categoryCombo ) {

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelement/ShowDataElementFormAction.java	2013-12-23 16:25:40 +0000
@@ -217,7 +217,7 @@
             .getDataElementCategoryComboByName( DataElementCategoryCombo.DEFAULT_CATEGORY_COMBO_NAME );
 
         dataElementCategoryCombos = new ArrayList<DataElementCategoryCombo>( dataElementCategoryService
-            .getAllDataElementCategoryCombos() );
+            .getDisaggregationCategoryCombos() );
 
         dataElementGroups = dataElementService.getAllDataElementGroups();