diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js
index 26f552ec8..1632685c5 100644
--- a/pmd/scripts/history.js
+++ b/pmd/scripts/history.js
@@ -1,4 +1,5 @@
 var history_array = []; // Global array to store history objects
+var select_field = [];
 var g_index;
 
 /**
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index 9e9d91307..684db4595 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -983,15 +983,20 @@ function Close_option()
 	document.getElementById('pmd_optionse').style.visibility = "hidden";
 }
 
-function Select_all(id_this)
+function Select_all(id_this,owner)
 {
 	var parent= document.form1;
+	var len = owner.length + 8;
 	for(i = 0; i < parent.elements.length; i++) {
 		if (parent.elements[i].type == "checkbox" && parent.elements[i].id.substring(0,(7 + id_this.length)) == 'select_' + id_this) {
-				if(document.getElementById('select_all_' + id_this).checked == true)
+				if(document.getElementById('select_all_' + id_this).checked == true) {
 					parent.elements[i].checked = true;
-				else
+					store_column(parent.elements[i].id.substring(len),owner);
+				}	
+				else {
 					parent.elements[i].checked = false;
+					store_column(parent.elements[i].id.substring(len),owner);
+				}
 		}
 	}
 	Re_load();
@@ -1009,6 +1014,25 @@ function Table_onover(id_this,val)
 	}
 }
 
+/* This function stores selected column information in select_field[]
+ * In case column is checked it add else it deletes
+ *
+ */
+function store_column(id_this,owner) {
+	var i = 0;
+	if (document.getElementById('select_' + owner + '.' + id_this).checked == true) {
+		select_field.push(id_this);	
+	}
+	else {
+		for(i; i < select_field.length ;i++) {
+			if ( select_field[i] == id_this ) {
+				select_field.splice(i,1);
+				break;
+			}
+		}
+	}
+}
+
 /**
  * This function builds object and adds them to history_array
  * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby)
diff --git a/pmd_general.php b/pmd_general.php
index d261a23ac..064a6cc98 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -204,7 +204,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 		echo '<td class="select_all">';
     	echo '<input type="checkbox" value="select_all_'.htmlspecialchars($t_n_url).'" style="margin: 0px;" ';
         echo 'id="select_all_'.htmlspecialchars($t_n_url).'" title="select all" ';
-        echo 'onclick="Select_all(\''. htmlspecialchars($t_n_url). '\')" ></td>';
+        echo 'onclick="Select_all(\''. htmlspecialchars($t_n_url) .'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\')"></td>';
 	}?>
     <td class="small_tab" onmouseover="this.className='small_tab2';"
         onmouseout="this.className='small_tab';"
@@ -272,8 +272,9 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 	if(isset($_REQUEST['query'])) {
     	echo '<td class="select_all">';
 	    echo '<input value="'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'"'; 
-        echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
- 		echo  'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" onclick="" ></td>';
+        echo 'type="checkbox" id="select_'.htmlspecialchars($t_n_url).'.'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
+ 		echo 'style="margin: 0px;" title="select_'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'" ';
+		echo 'onclick="store_column(\''.urlencode($GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$i]).'.'.urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]).'\',\''.htmlspecialchars($GLOBALS['PMD_OUT']["OWNER"][$i]).'\')"></td>';
 	}?>
     <td width="10px" colspan="3"
         id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>">