=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java	2010-12-07 17:02:27 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementOperand.java	2011-01-12 06:52:09 +0000
@@ -240,6 +240,7 @@
      */
     public void updateProperties( DataElement dataElement, DataElementCategoryOptionCombo categoryOptionCombo )
     {        
+        this.categoryOptionCombo = categoryOptionCombo;
         this.dataElementId = dataElement.getId();
         this.optionComboId = categoryOptionCombo.getId();
         this.operandId = dataElement.getId() + SEPARATOR + categoryOptionCombo.getId();
@@ -248,6 +249,7 @@
         this.frequencyOrder = dataElement.getFrequencyOrder();
         this.aggregationLevels = new ArrayList<Integer>( dataElement.getAggregationLevels() );
         this.valueType = dataElement.getType();
+        this.dataElement = dataElement;
     }
 
     /**
@@ -264,7 +266,8 @@
         this.aggregationOperator = dataElement.getAggregationOperator();
         this.frequencyOrder = dataElement.getFrequencyOrder();
         this.aggregationLevels = new ArrayList<Integer>( dataElement.getAggregationLevels() );
-        this.valueType = dataElement.getType();        
+        this.valueType = dataElement.getType();
+        this.dataElement = dataElement;
     }
 
     /**

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-01-10 06:17:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-01-12 06:52:09 +0000
@@ -1068,7 +1068,7 @@
 */
 function removeValidatorRulesById( inputId, rules )
 {
-	removeValidatorRules( jQuery("#" + inputId) );
+	removeValidatorRules( jQuery("#" + inputId), rules);
 }
 
 function removeValidatorRules( input, rules )

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java	2011-01-11 18:18:03 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/dataentryform/ViewDataEntryFormAction.java	2011-01-12 06:52:09 +0000
@@ -162,8 +162,7 @@
 
         autoSave = (Boolean) userSettingService.getUserSetting( UserSettingService.AUTO_SAVE_DATA_ENTRY_FORM, false );
 
-        operands = new ArrayList<DataElementOperand>( dataElementCategoryService.getFullOperands( dataSet
-            .getDataElements() ) );
+        operands = new ArrayList<DataElementOperand>( dataElementCategoryService.getOperands( dataSet.getDataElements() ) );
 
         Collections.sort( operands, new DataElementOperandNameComparator() );