=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2009-03-20 20:33:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/dataSet.js	2009-10-06 08:16:57 +0000
@@ -245,17 +245,21 @@
 
     while ( list.selectedIndex != -1 )
     {
+		var selectedList = byId( 'selectedList' );
         var id = list.options[list.selectedIndex].value;
-
-        list.options[list.selectedIndex].selected = false;
-
-        dataSetMembers[id] = availableDataElements[id];
+		
+		dataSetMembers[id] = availableDataElements[id];
+		
+		addOptionToList( selectedList, id, dataSetMembers[id] );
+		
+        list.remove( list.selectedIndex );
         
         delete availableDataElements[id];        
     }
     
-    filterDataSetMembers();
-    filterAvailableDataElements();
+	//Not filter anymore
+    //filterDataSetMembers();
+    //filterAvailableDataElements();
 }
 
 function removeDataSetMembers()
@@ -264,15 +268,19 @@
 
     while ( list.selectedIndex != -1 )
     {
+		var availableList = byId( 'availableList' );
         var id = list.options[list.selectedIndex].value;
 
-        list.options[list.selectedIndex].selected = false;
-
         availableDataElements[id] = dataSetMembers[id];
+		
+		addOptionToList( availableList, id, availableDataElements[id] );
+		
+		list.remove( list.selectedIndex );
         
         delete dataSetMembers[id];        
     }
     
-    filterDataSetMembers();
-    filterAvailableDataElements();
+	//Not filter anymore
+    //filterDataSetMembers();
+    //filterAvailableDataElements();
 }