diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js
index d6d5ef324..ace5bae65 100644
--- a/pmd/scripts/history.js
+++ b/pmd/scripts/history.js
@@ -1,81 +1,93 @@
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * @fileoverview    function used in this file builds history tab and generates query.
+  *
+  * @requires    jQuery
+  * @requires    moves.js
+  * @version $Id$
+  */
+  
 var history_array = []; // Global array to store history objects
-var select_field = [];
+var select_field = [];  // Global array to store informaation for columns which are used in select clause
 var g_index;
 
 /**
- * J-query function for panel, hides and shows toggle_container <div>
+ * function for panel, hides and shows toggle_container <div>,which is for history elements uses {@link JQuery}.
  *
  * @param	index	has value 1 or 0,decides wheter to hide toggle_container on load. 
 **/
 
 function panel(index) {
-	if (!index) {
-		$(".toggle_container").hide(); 
-	}
-		$("h2.tiger").click(function(){
-		$(this).toggleClass("active").next().slideToggle("slow");
-		});
+    if (!index) {
+        $(".toggle_container").hide(); 
+    }
+    $("h2.tiger").click(function(){
+    $(this).toggleClass("active").next().slideToggle("slow");
+    });
 }
 
 /**
- * Sorts history_array[] first then generates the HTML code for history tab,clubbing all objects of same tables together
+ * Sorts history_array[] first,using table name as the key and then generates the HTML code for history tab,
+ * clubbing all objects of same tables together
  * This function is called whenever changes are made in history_array[]
  *
  * @uses	and_or()
  * @uses	history_edit()
  * @uses	history_delete()
  * 	
- * @param	init	starting index of unsorted array   
- * @param	fianl	last index of unsorted array
+ * @param {int}  init 	starting index of unsorted array   
+ * @param {int}	final   last index of unsorted array
  *
 **/
 
 function display(init,final) {
-	 var str,i,j,k,sto;
-	 for (i = init;i < final;i++) {
-		sto = history_array[i];
-		var temp = history_array[i].get_tab() + '.' + history_array[i].get_obj_no();
-		for(j = 0;j < i;j++){
-			if(temp > (history_array[j].get_tab() + '.' + history_array[j].get_obj_no())) {
-				for(k = i;k > j;k--) {
-					history_array[k] = history_array[k-1];
-				}
-				history_array[j] = sto;
-				break;
-			}
-		}
-	 }
-	 str =''; // string to store Html code for history tab
-	 for ( var i=0; i < history_array.length; i++){
-		var temp = history_array[i].get_tab() + '.' + history_array[i].get_obj_no();
-		str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';  				
-		str += '<div class="toggle_container">\n';
-		while((history_array[i].get_tab() + '.' + history_array[i].get_obj_no()) == temp) {
-			str +='<div class="block"> <table width ="250">';
-			str += '<thead><tr><td>';
-			if(history_array[i].get_and_or()){
-				str +='<img src="pmd/images/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>';
-			}
-			else {
-				str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
-			}
-			str +='<td style="padding-left: 5px;" align="right"><img src="./themes/original/img/b_sbrowse.png" title="column name"/></td><td width="175" 	  style="padding-left: 5px">' + history_array[i].get_column_name();
-			if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
-				str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
-			}
-			else {
-				str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img src="themes/original/img/b_edit.png" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; 
-			}
-			i++;
-			if(i >= history_array.length) {
-				break;
-			}
-			str += '</table></div><br/>';
-		}
-		i--;
-	 	str += '</div><br/>';
-	 }
-	 return str;
+    var str,i,j,k,sto;
+    // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. 
+    for (i = init;i < final;i++) {
+        sto = history_array[i];
+        var temp = history_array[i].get_tab() ;//+ '.' + history_array[i].get_obj_no(); for Self JOINS
+        for(j = 0;j < i;j++){
+            if(temp > (history_array[j].get_tab())) {//+ '.' + history_array[j].get_obj_no())) { //for Self JOINS
+                for(k = i;k > j;k--) {
+                    history_array[k] = history_array[k-1];
+                }
+                history_array[j] = sto;
+                break;
+            }
+        }
+    }
+    // this part generates HTML code for history tab.adds delete,edit,and/or and detail features with objects.
+    str =''; // string to store Html code for history tab
+    for ( var i=0; i < history_array.length; i++){
+        var temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN
+        str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';  				
+        str += '<div class="toggle_container">\n';
+        while((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) {
+            str +='<div class="block"> <table width ="250">';
+            str += '<thead><tr><td>';
+            if(history_array[i].get_and_or()){
+                str +='<img src="pmd/images/or_icon.png" onclick="and_or('+i+')" title="OR"/></td>';
+            }
+            else {
+               str +='<img src="pmd/images/and_icon.png" onclick="and_or('+i+')" title="AND"/></td>';
+            }
+            str +='<td style="padding-left: 5px;" align="right"><img src="./themes/original/img/b_sbrowse.png" title="column name"/></td><td width="175" style="padding-left:            5px">' + history_array[i].get_column_name();
+            if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
+                str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type()                + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img                src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
+           }
+           else {
+               str += '</td><td align="center"><img src="themes/original/img/b_info.png" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i].               get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img               src="themes/original/img/b_edit.png" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; 
+           }
+           i++;
+           if(i >= history_array.length) {
+               break;
+           }
+           str += '</table></div><br/>';
+        }
+        i--;
+        str += '</div><br/>';
+    }
+    return str;
 }
 
 /**
@@ -83,58 +95,58 @@ function display(init,final) {
  * 
  * @uses	panel()
  *
- * @param	index	index of history_array where change is to be made
+ * @param {int} index of history_array where change is to be made
  *
 **/
 
 function and_or(index) {
-	if (history_array[index].get_and_or()) {
-		history_array[index].set_and_or(0);
-	}
-	else {
-		history_array[index].set_and_or(1);
-	}
-	var existingDiv = document.getElementById('ab');
-	existingDiv.innerHTML = display(0,0);
-	panel(1);
+    if (history_array[index].get_and_or()) {
+        history_array[index].set_and_or(0);
+    }
+    else {
+        history_array[index].set_and_or(1);
+    }
+    var existingDiv = document.getElementById('ab');
+    existingDiv.innerHTML = display(0,0);
+    panel(1);
 }
 
 /**
- * To display details of obects(where,rename,aggregate,groupby,orderby,having)
+ * To display details of obects(where,rename,Having,aggregate,groupby,orderby,having)
  * 
  * @param	index	index of history_array where change is to be made
  *
 **/
 
 function detail (index) {
-	var type = history_array[index].get_type();
-	var str;
-	if (type == "Where") {
-		str = 'Where ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
-	}
-	if (type == "Rename") {
-		str = 'Rename ' + history_array[index].get_column_name() + ' To ' + history_array[index].get_obj().getrename_to();
-	}
-	if (type == "Aggregate") {
-		str = 'Select ' + history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )';
-	}
-	if (type == "GroupBy") {
-		str = 'GroupBy ' + history_array[index].get_column_name() ;
-	}
-	if (type == "OrderBy") {
-		str = 'OrderBy ' + history_array[index].get_column_name() ;
-	}
-	if (type == "Having") {
-		str = 'Having ';
-		if (history_array[index].get_obj().get_operator() != 'None') {
-			str += history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )';
-			str += history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
-		}
-		else {
-			str = 'Having ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
-		}
-	}
-	return str;
+    var type = history_array[index].get_type();
+    var str;
+    if (type == "Where") {
+        str = 'Where ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
+    }
+    if (type == "Rename") {
+        str = 'Rename ' + history_array[index].get_column_name() + ' To ' + history_array[index].get_obj().getrename_to();
+    }
+    if (type == "Aggregate") {
+        str = 'Select ' + history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )';
+    }
+    if (type == "GroupBy") {
+        str = 'GroupBy ' + history_array[index].get_column_name() ;
+    }
+    if (type == "OrderBy") {
+        str = 'OrderBy ' + history_array[index].get_column_name() ;
+    }
+    if (type == "Having") {
+        str = 'Having ';
+        if (history_array[index].get_obj().get_operator() != 'None') {
+            str += history_array[index].get_obj().get_operator() + '( ' + history_array[index].get_column_name() + ' )';
+            str += history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
+        }
+        else {
+            str = 'Having ' + history_array[index].get_column_name() + history_array[index].get_obj().getrelation_operator() + history_array[index].get_obj().getquery();
+        }
+    }
+    return str;
 }
 
 /**
@@ -147,66 +159,66 @@ function detail (index) {
 **/
 
 function history_delete(index) {
-	for(var k =0 ;k < from_array.length;k++){
-		if(from_array[k] == history_array[index].get_tab()){ 
-			from_array.splice(k,1); 
-			break;
-		}
-	}
-	history_array.splice(index,1);
-	var existingDiv = document.getElementById('ab');
-	existingDiv.innerHTML = display(0,0);
-	panel(1);
+    for(var k =0 ;k < from_array.length;k++){
+        if(from_array[k] == history_array[index].get_tab()){ 
+            from_array.splice(k,1); 
+            break;
+        }
+    }
+    history_array.splice(index,1);
+    var existingDiv = document.getElementById('ab');
+    existingDiv.innerHTML = display(0,0);
+    panel(1);
 }
 
 /**
- * To show where,rename,aggregate forms to edit a object
+ * To show where,rename,aggregate,having forms to edit a object
  * 
- * @param	index	index of history_array where change is to be made
+ * @param{int} index	index of history_array where change is to be made
  *
 **/
 
 function history_edit(index) {
-	g_index = index;
-	var type = history_array[index].get_type();
-	if (type == "Where") {
-		document.getElementById('eQuery').value = history_array[index].get_obj().getquery();
-		document.getElementById('erel_opt').value = history_array[index].get_obj().getrelation_operator();
-		document.getElementById('query_where').style.left =  '230px';
-     	document.getElementById('query_where').style.top  = '330px';
-		document.getElementById('query_where').style.position  = 'absolute';
-		document.getElementById('query_where').style.zIndex = '9';
-		document.getElementById('query_where').style.visibility = 'visible';
-	}
-	if (type == "Having") {
-		document.getElementById('hQuery').value = history_array[index].get_obj().getquery();
-		document.getElementById('hrel_opt').value = history_array[index].get_obj().getrelation_operator();
-		document.getElementById('hoperator').value = history_array[index].get_obj().get_operator();
-		document.getElementById('query_having').style.left =  '230px';
-     	document.getElementById('query_having').style.top  = '330px';
-		document.getElementById('query_having').style.position  = 'absolute';
-		document.getElementById('query_having').style.zIndex = '9';
-		document.getElementById('query_having').style.visibility = 'visible';
-	}
-	if (type == "Rename") {
-     	document.getElementById('query_rename_to').style.left =  '230px';
-     	document.getElementById('query_rename_to').style.top  = '330px';
-		document.getElementById('query_rename_to').style.position  = 'absolute';
-		document.getElementById('query_rename_to').style.zIndex = '9';
-		document.getElementById('query_rename_to').style.visibility = 'visible';
-	}
-	if (type == "Aggregate") {
-		document.getElementById('query_Aggregate').style.left = '530px';
-     	document.getElementById('query_Aggregate').style.top  = '130px';
-		document.getElementById('query_Aggregate').style.position  = 'absolute';
-		document.getElementById('query_Aggregate').style.zIndex = '9';
-		document.getElementById('query_Aggregate').style.visibility = 'visible';
-	}
+    g_index = index;
+    var type = history_array[index].get_type();
+    if (type == "Where") {
+        document.getElementById('eQuery').value = history_array[index].get_obj().getquery();
+        document.getElementById('erel_opt').value = history_array[index].get_obj().getrelation_operator();
+        document.getElementById('query_where').style.left =  '530px';
+        document.getElementById('query_where').style.top  = '130px';
+        document.getElementById('query_where').style.position  = 'absolute';
+        document.getElementById('query_where').style.zIndex = '9';
+        document.getElementById('query_where').style.visibility = 'visible';
+    }
+    if (type == "Having") {
+        document.getElementById('hQuery').value = history_array[index].get_obj().getquery();
+        document.getElementById('hrel_opt').value = history_array[index].get_obj().getrelation_operator();
+        document.getElementById('hoperator').value = history_array[index].get_obj().get_operator();
+        document.getElementById('query_having').style.left =  '530px';
+        document.getElementById('query_having').style.top  = '130px';
+        document.getElementById('query_having').style.position  = 'absolute';
+        document.getElementById('query_having').style.zIndex = '9';
+        document.getElementById('query_having').style.visibility = 'visible';
+    }
+    if (type == "Rename") {
+        document.getElementById('query_rename_to').style.left =  '530px';
+        document.getElementById('query_rename_to').style.top  = '130px';
+        document.getElementById('query_rename_to').style.position  = 'absolute';
+        document.getElementById('query_rename_to').style.zIndex = '9';
+        document.getElementById('query_rename_to').style.visibility = 'visible';
+    }
+    if (type == "Aggregate") {
+        document.getElementById('query_Aggregate').style.left = '530px';
+        document.getElementById('query_Aggregate').style.top  = '130px';
+        document.getElementById('query_Aggregate').style.position  = 'absolute';
+        document.getElementById('query_Aggregate').style.zIndex = '9';
+        document.getElementById('query_Aggregate').style.visibility = 'visible';
+    }
 }
 
 /**
- * Make changes in history_array when Edit is clicked
- * 
+ * Make changes in history_array when Edit button is clicked
+ * checks for the type of object and then sets the new value
  * @uses	panel()
  * @uses	display()
  *
@@ -214,38 +226,38 @@ function history_edit(index) {
 **/
 
 function edit(type) {
-	if (type == "Rename") {
-		if (document.getElementById('e_rename').value != "") {
-			history_array[g_index].get_obj().setrename_to(document.getElementById('e_rename').value);
-			document.getElementById('e_rename').value = "";
-		}
-		document.getElementById('query_rename_to').style.visibility = 'hidden';
-	}
-	if (type == "Aggregate") {
-		if (document.getElementById('e_operator').value != '---') {
-			history_array[g_index].get_obj().set_operator(document.getElementById('e_operator').value);
-			document.getElementById('e_operator').value = '---';
-		}
-		document.getElementById('query_Aggregate').style.visibility = 'hidden';
-	}
-	if (type == "Where") {
-		if (document.getElementById('erel_opt').value != '--' && document.getElementById('eQuery').value !="") {
-			history_array[g_index].get_obj().setquery(document.getElementById('eQuery').value);
-			history_array[g_index].get_obj().setrelation_operator(document.getElementById('erel_opt').value);
-		}
-		document.getElementById('query_where').style.visibility = 'hidden';
-	}
-	if (type == "Having") {
-		if (document.getElementById('hrel_opt').value != '--' && document.getElementById('hQuery').value !="") {
-			history_array[g_index].get_obj().setquery(document.getElementById('hQuery').value);
-			history_array[g_index].get_obj().setrelation_operator(document.getElementById('hrel_opt').value);
-			history_array[g_index].get_obj().set_operator(document.getElementById('hoperator').value);
-		}
-		document.getElementById('query_having').style.visibility = 'hidden';
-	}
-	var existingDiv = document.getElementById('ab');
-	existingDiv.innerHTML = display(0,0);
-	panel(1);
+    if (type == "Rename") {
+        if (document.getElementById('e_rename').value != "") {
+            history_array[g_index].get_obj().setrename_to(document.getElementById('e_rename').value);
+            document.getElementById('e_rename').value = "";
+        }
+        document.getElementById('query_rename_to').style.visibility = 'hidden';
+    }
+    if (type == "Aggregate") {
+        if (document.getElementById('e_operator').value != '---') {
+            history_array[g_index].get_obj().set_operator(document.getElementById('e_operator').value);
+            document.getElementById('e_operator').value = '---';
+        }
+        document.getElementById('query_Aggregate').style.visibility = 'hidden';
+    }
+    if (type == "Where") {
+        if (document.getElementById('erel_opt').value != '--' && document.getElementById('eQuery').value !="") {
+        history_array[g_index].get_obj().setquery(document.getElementById('eQuery').value);
+        history_array[g_index].get_obj().setrelation_operator(document.getElementById('erel_opt').value);
+        }
+        document.getElementById('query_where').style.visibility = 'hidden';
+    }
+    if (type == "Having") {
+        if (document.getElementById('hrel_opt').value != '--' && document.getElementById('hQuery').value !="") {
+            history_array[g_index].get_obj().setquery(document.getElementById('hQuery').value);
+            history_array[g_index].get_obj().setrelation_operator(document.getElementById('hrel_opt').value);
+            history_array[g_index].get_obj().set_operator(document.getElementById('hoperator').value);
+        }
+        document.getElementById('query_having').style.visibility = 'hidden';
+    }
+    var existingDiv = document.getElementById('ab');
+    existingDiv.innerHTML = display(0,0);
+    panel(1);
 }
 
 /**
@@ -260,57 +272,57 @@ function edit(type) {
 **/
 
 function history(ncolumn_name,nobj,ntab,nobj_no,ntype) {
-	var and_or;
-	var obj;
-	var tab;
-	var column_name;
-	var obj_no;
-	var type;
-	this.set_column_name = function (ncolumn_name) {
-		column_name = ncolumn_name;
-	};
-	this.get_column_name = function() {
-		return column_name;
-	};
-	this.set_and_or = function(nand_or) {
-		and_or = nand_or;
-	};
-	this.get_and_or = function() {
-		return and_or;
-	}
-	this.get_relation = function() {
-		return and_or;
-	};
-	this.set_obj = function(nobj) {
-		obj = nobj;
-	};
-	this.get_obj = function() {
-		return obj;
-	};
-	this.set_tab = function(ntab) {
-		tab = ntab;
-	};
-	this.get_tab = function() {
-		return tab;
-	};
-	this.set_obj_no = function(nobj_no) {
-		obj_no = nobj_no;
-	};
-	this.get_obj_no = function() {
-		return obj_no;
-	};
-	this.set_type = function(ntype) {
-		type = ntype;
-	}
-	this.get_type = function() {
-		return type;
-	}
-	this.set_obj_no(nobj_no);
-	this.set_tab(ntab);
-	this.set_and_or(0);
-	this.set_obj(nobj);
-	this.set_column_name(ncolumn_name);
-	this.set_type(ntype);
+    var and_or;
+    var obj;
+    var tab;
+    var column_name;
+    var obj_no;
+    var type;
+    this.set_column_name = function (ncolumn_name) {
+        column_name = ncolumn_name;
+    };
+    this.get_column_name = function() {
+        return column_name;
+    };
+    this.set_and_or = function(nand_or) {
+        and_or = nand_or;
+    };
+    this.get_and_or = function() {
+        return and_or;
+    }
+    this.get_relation = function() {
+        return and_or;
+    };
+    this.set_obj = function(nobj) {
+        obj = nobj;
+    };
+    this.get_obj = function() {
+        return obj;
+    };
+    this.set_tab = function(ntab) {
+        tab = ntab;
+    };
+    this.get_tab = function() {
+        return tab;
+    };
+    this.set_obj_no = function(nobj_no) {
+        obj_no = nobj_no;
+     };
+    this.get_obj_no = function() {
+        return obj_no;
+    };
+    this.set_type = function(ntype) {
+        type = ntype;
+    }
+    this.get_type = function() {
+        return type;
+    }
+    this.set_obj_no(nobj_no);
+    this.set_tab(ntab);
+    this.set_and_or(0);
+    this.set_obj(nobj);
+    this.set_column_name(ncolumn_name);
+    this.set_type(ntype);
 };
 
 /**
@@ -323,49 +335,58 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) {
 
 
 var where = function (nrelation_operator,nquery) {
-	var relation_operator;
-	var query;
-	this.setrelation_operator = function(nrelation_operator) {
-		relation_operator = nrelation_operator;
-	};
-	this.setquery = function(nquery) {
-		query = nquery;
-	};
-	this.getquery = function() {
-		return query;
-	};
-	this.getrelation_operator = function() {
-		return relation_operator;
-	};
-	this.setquery(nquery);
-	this.setrelation_operator(nrelation_operator);
+    var relation_operator;
+    var query;
+    this.setrelation_operator = function(nrelation_operator) {
+        relation_operator = nrelation_operator;
+    };
+    this.setquery = function(nquery) {
+        query = nquery;
+    };
+    this.getquery = function() {
+        return query;
+    };
+    this.getrelation_operator = function() {
+        return relation_operator;
+    };
+    this.setquery(nquery);
+    this.setrelation_operator(nrelation_operator);
 };
 
+
+/**
+ * Having object closure, makes an object with all information of where
+ *
+ * @param	nrelation_operator	type of relation operator to be applied
+ * @param	nquery				stores value of value/sub-query 
+ *
+**/
+
 var having = function (nrelation_operator,nquery,noperator) {
-	var relation_operator;
-	var query;
-	var operator;
-	this.set_operator = function(noperator) {
-		operator = noperator;
-	};
-	this.setrelation_operator = function(nrelation_operator) {
-		relation_operator = nrelation_operator;
-	};
-	this.setquery = function(nquery) {
-		query = nquery;
-	};
-	this.getquery = function() {
-		return query;
-	};
-	this.getrelation_operator = function() {
-		return relation_operator;
-	};
-	this.get_operator = function() {
-		return operator;
-	};
-	this.setquery(nquery);
-	this.setrelation_operator(nrelation_operator);
-	this.set_operator(noperator);
+    var relation_operator;
+    var query;
+    var operator;
+    this.set_operator = function(noperator) {
+        operator = noperator;
+    };
+    this.setrelation_operator = function(nrelation_operator) {
+        relation_operator = nrelation_operator;
+    };
+    this.setquery = function(nquery) {
+        query = nquery;
+    };
+    this.getquery = function() {
+        return query;
+    };
+    this.getrelation_operator = function() {
+        return relation_operator;
+    };
+    this.get_operator = function() {
+        return operator;
+    };
+    this.setquery(nquery);
+    this.setrelation_operator(nrelation_operator);
+    this.set_operator(noperator);
 };
 
 /**
@@ -376,14 +397,14 @@ var having = function (nrelation_operator,nquery,noperator) {
 **/
 
 var rename = function(nrename_to) {
-	var rename_to;
-	this.setrename_to = function(nrename_to) {
-		rename_to = nrename_to;
-	};
-	this.getrename_to =function() {
-		return rename_to;
-	};
-	this.setrename_to(nrename_to);
+    var rename_to;
+    this.setrename_to = function(nrename_to) {
+        rename_to = nrename_to;
+    };
+    this.getrename_to =function() {
+        return rename_to;
+    };
+    this.setrename_to(nrename_to);
 };
 
 /**
@@ -394,286 +415,351 @@ var rename = function(nrename_to) {
 **/
 
 var aggregate = function(noperator) {
-	var operator;
-	this.set_operator = function(noperator) {
-		operator = noperator;
-	};
-	this.get_operator = function() {
-		return operator;
-	};
-	this.set_operator(noperator);
+    var operator;
+    this.set_operator = function(noperator) {
+        operator = noperator;
+    };
+    this.get_operator = function() {
+        return operator;
+    };
+    this.set_operator(noperator);
 };
 
+/**
+ * This function returns unique element from an array
+ *
+ * @param arraName array from which duplicate elem are to be removed.
+ * @return unique array
+ */
+
 function unique(arrayName) {
-	var newArray=new Array();
+    var newArray=new Array();
     label:for(var i=0; i<arrayName.length;i++ )
     {  
-       for(var j=0; j<newArray.length;j++ )
-       {
+        for(var j=0; j<newArray.length;j++ )
+        {
             if(newArray[j]==arrayName[i]) 
-            	continue label;
+                continue label;
         }
         newArray[newArray.length] = arrayName[i];
-     }
-       return newArray;
+    }
+   return newArray;
 }
 
+/**
+ * This function takes in array and a value as input and returns 1 if values is present in array
+ * else returns -1
+ *
+ * @param arrayName array
+ * @param value  value which is to be searched in the array
+ */
+ 
 function found(arrayName,value) {
-	for(var i=0; i<arrayName.length; i++) {
-		if(arrayName[i] == value) { return 1;}
-	}
-	return -1;
+    for(var i=0; i<arrayName.length; i++) {
+        if(arrayName[i] == value) { return 1;}
+    }
+    return -1;
 }
-			
+		
+/**
+ * This function is the main function for query building.
+ * uses history object details for this.
+ *
+ * @ uses query_where()
+ * @ uses query_groupby()
+ * @ uses query_having() 
+ * @ uses query_orderby()
+ * 
+ * @param formtitle title for the form
+ * @param fadin      
+ */
+ 
 function build_query(formtitle, fadin) {
-	
-	var q_select = "SELECT ";
-	var temp;
-	for(i = 0;i < select_field.length; i++) {
-		temp = check_aggregate(select_field[i]);
-		if (temp != "") {
-			q_select += temp;
-			temp = check_rename(select_field[i]);
-			q_select += temp + ",";
-		}
-		else {
-			temp = check_rename(select_field[i]);
-			q_select += select_field[i] + temp +","; 
-		}
-	}
-	q_select = q_select.substring(0,q_select.length - 1);
-	q_select += " FROM " + query_from();
-	if(query_where() != "") {
-		q_select +="\n WHERE";
+    var q_select = "SELECT ";
+    var temp;
+    for(i = 0;i < select_field.length; i++) {
+        temp = check_aggregate(select_field[i]);
+        if (temp != "") {
+            q_select += temp;
+            temp = check_rename(select_field[i]);
+            q_select += temp + ",";
+        }
+        else {
+            temp = check_rename(select_field[i]);
+            q_select += select_field[i] + temp +","; 
+        }
+    }
+    q_select = q_select.substring(0,q_select.length - 1);
+    q_select += " FROM " + query_from();
+    if(query_where() != "") {
+        q_select +="\n WHERE";
 		q_select += query_where();
-	}
-	if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); }
-	if(query_having() != "") { q_select += "\nHAVING " + query_having(); }
-	if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); }
-	 var box = document.getElementById('box'); 
-  	document.getElementById('filter').style.display='block';
-  	var btitle = document.getElementById('boxtitle');
-  	btitle.innerHTML = formtitle;
-  	if(fadin)
-  	{
-		 gradient("box", 0);
-	 	fadein("box");
-  	}
-  	else
-  	{ 	
-  	  box.style.display='block';
-  	}  	
-	document.getElementById('textSqlquery').innerHTML = q_select;
-//	document.getElementById('hint').style.visibility = "visible";
+    }
+    if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); }
+    if(query_having() != "") { q_select += "\nHAVING " + query_having(); }
+    if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); }
+    var box = document.getElementById('box'); 
+    document.getElementById('filter').style.display='block';
+    var btitle = document.getElementById('boxtitle');
+    btitle.innerHTML = 'SELECT';//formtitle;
+    if(fadin){
+        gradient("box", 0);
+        fadein("box");
+    }
+    else{ 	
+        box.style.display='block';
+    }  	
+    document.getElementById('textSqlquery').innerHTML = q_select;
 }
+ /**
+  * This function builds from clause of query
+  * makes automatic joins.
+  * 
+  * @uses unique
+  * @uses add_array
+  * @uses remove_array
+  *
+  */
+ 
 
 function query_from() {
-	var i =0;
-	var tab_left = [];
-	var tab_used = [];
-	var t_tab_used = [];
-	var t_tab_left = [];
-	var temp;
-	var query = "";
-	var quer = "";
-	var parts = [];
-	var t_array = [];
-	t_array = from_array;
-	var K = 0;
-	for(i; i < history_array.length ; i++) {
-		from_array.push(history_array[i].get_tab());
-	}
-	from_array = unique( from_array );
-	tab_left = from_array;
-	temp = tab_left.shift();
-	quer = temp;
-	tab_used.push(temp);
+    var i =0;
+    var tab_left = [];
+    var tab_used = [];
+    var t_tab_used = [];
+    var t_tab_left = [];
+    var temp;
+    var query = "";
+    var quer = "";
+    var parts = [];
+    var t_array = [];
+    t_array = from_array;
+    var K = 0;
+    for(i; i < history_array.length ; i++) {
+        from_array.push(history_array[i].get_tab());
+    }
+    from_array = unique( from_array );
+    tab_left = from_array;
+    temp = tab_left.shift();
+    quer = temp;
+    tab_used.push(temp);
+    // if master table (key2) matches with tab used get all keys and check if tab_left matches 
+    //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . 
 	for( i =0; i<2 ; i++) {
-		for (K in contr){
-        	for (key in contr[K]){// contr name
-			// if master table (key2) matches with tab used get all keys and check if tab_left matches 
-			//after this check if master table (key2) matches with tab left then check if any foriegn matches with master . 
-        	    for (key2 in contr[K][key]){// table name
-				   parts = key2.split(".");
-        	       if(found(tab_used,parts[1]) > 0)  {
-				   		for (key3 in contr[K][key][key2]) {
-							parts1 = contr[K][key][key2][key3][0].split(".");
-							if(found(tab_left,parts1[1]) > 0) {
-								query += "\n" + 'LEFT JOIN ';
-								query += '`' + parts1[0] + '`.`' + parts1[1] + '` ON ' ;
-								query += '`' + parts[1] +'`.`' + key3 + '` = ';
-								query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
-								t_tab_left.push(parts1[1]);
-							}
-						}
-				   }
-				}
-			}
-		}	
-		K = 0;
-		t_tab_left = unique (t_tab_left);
-		tab_used = add_array(t_tab_left,tab_used);
-		tab_left = remove_array(t_tab_left,tab_left);
-		t_tab_left = [];
-		for (K in contr) {
-    		for (key in contr[K]) {
-			   for (key2 in contr[K][key]){// table name
-				   parts = key2.split(".");
-            	   if(found(tab_left,parts[1]) > 0)
-				   {	
-				   		for (key3 in contr[K][key][key2]) // field name
-            	    	{
-							parts1 = contr[K][key][key2][key3][0].split(".");
-							if(found(tab_used,parts1[1]) > 0) {
-								query += "\n" + 'LEFT JOIN ';
-								query += '`' + parts[0] + '`.`' + parts[1] + '` ON ' ;
-								query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
-								query += '`' + parts[1] + '`.`' + key3 + '` ';
-								
-								t_tab_left.push(parts[1]);
-			         		}
-						}
-					}
-		   		}
-		   	}
-		}
-		t_tab_left = unique (t_tab_left);
-		tab_used = add_array(t_tab_left,tab_used);
-		tab_left = remove_array(t_tab_left,tab_left);
-		t_tab_left = [];
-	}
-	for (k in tab_left) {
-		quer += " , `" + tab_left[k] + "`";
-	}
-			query = quer + query;
-			from_array = t_array;
-			return query;
+        for (K in contr){
+            for (key in contr[K]){// contr name
+	             for (key2 in contr[K][key]){// table name
+                    parts = key2.split(".");
+                    if(found(tab_used,parts[1]) > 0)  {
+                        for (key3 in contr[K][key][key2]) {
+                            parts1 = contr[K][key][key2][key3][0].split(".");
+                            if(found(tab_left,parts1[1]) > 0) {
+                                query += "\n" + 'LEFT JOIN ';
+                                query += '`' + parts1[0] + '`.`' + parts1[1] + '` ON ' ;
+                                query += '`' + parts[1] +'`.`' + key3 + '` = ';
+                                query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` ';
+                                t_tab_left.push(parts1[1]);
+                            }
+                        }
+                    }
+                }
+            }
+        }	
+        K = 0;
+        t_tab_left = unique (t_tab_left);
+        tab_used = add_array(t_tab_left,tab_used);
+        tab_left = remove_array(t_tab_left,tab_left);
+        t_tab_left = [];
+        for (K in contr) {
+             for (key in contr[K]) {
+                 for (key2 in contr[K][key]){// table name
+                     parts = key2.split(".");
+                         if(found(tab_left,parts[1]) > 0){	
+                           for (key3 in contr[K][key][key2]){
+                               parts1 = contr[K][key][key2][key3][0].split(".");
+                               if(found(tab_used,parts1[1]) > 0) {
+                                   query += "\n" + 'LEFT JOIN ';
+                                   query += '`' + parts[0] + '`.`' + parts[1] + '` ON ' ;
+                                   query += '`' + parts1[1] + '`.`' + contr[K][key][key2][key3][1] + '` = ';
+                                   query += '`' + parts[1] + '`.`' + key3 + '` ';
+                                   t_tab_left.push(parts[1]);
+                               }
+                           }
+                     }
+                 }
+            }
+        }
+        t_tab_left = unique (t_tab_left);
+        tab_used = add_array(t_tab_left,tab_used);
+        tab_left = remove_array(t_tab_left,tab_left);
+        t_tab_left = [];
+    }
+    for (k in tab_left) {
+        quer += " , `" + tab_left[k] + "`";
+    }
+        query = quer + query;
+        from_array = t_array;
+        return query;
 }
 				/*		document.write(key3+";"); //master_field
 							document.write(contr[K][key][key2][key3][0]+";"); // foreign_table
 							document.write(contr[K][key][key2][key3][1]+";"); //forieign_feild */
-            
+/**
+ * This function concatenates two array
+ *
+ * @params add array elements of which are pushed in
+ * @params arr array in which elemnets are added
+ */
 function add_array(add,arr){
-	for( var i=0; i<add.length; i++){
-		arr.push(add[i]);
-	}
-	return arr;
+    for( var i=0; i<add.length; i++){
+        arr.push(add[i]);
+    }
+    return arr;
 }
-
+ 
+/* This fucntion removes all elements present in one array from the other.
+ *
+ * @params rem array from which each element is removed from other array.
+ * @params arr array from which elements are removed.
+ *
+ */
 function remove_array(rem,arr){
-	for(var i=0; i<rem.length; i++){
-		for(var j=0; j<arr.length; j++)
-			if(rem[i] == arr[j]) { arr.splice(j,1); }
-	}
-	return arr;
+    for(var i=0; i<rem.length; i++){
+        for(var j=0; j<arr.length; j++)
+            if(rem[i] == arr[j]) { arr.splice(j,1); }
+    }
+    return arr;
 }
 
+/**
+ * This function builds the groupby clause from history object
+ *
+ */
+ 
 function query_groupby() {
-	var i = 0;
-	var str = "";
-	for(i; i < history_array.length;i++) {
-		if(history_array[i].get_type() == "GroupBy") { str +=history_array[i].get_column_name() + ", ";}
-	}
-	str = str.substr(0,str.length -1);
-	return str;
+    var i = 0;
+    var str = "";
+    for(i; i < history_array.length;i++) {
+        if(history_array[i].get_type() == "GroupBy") { str +=history_array[i].get_column_name() + ", ";}
+    }
+    str = str.substr(0,str.length -1);
+    return str;
 }
 
+/**
+ * This function builds the Having clause from the history object.
+ *
+ */
+
 function query_having() {
-	var i = 0;
-	var and = "(";
-	for(i; i < history_array.length;i++) {
-		if(history_array[i].get_type() == "Having") {
-			if (history_array[i].get_obj().get_operator() != 'None') {
-				and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator();
-				and += " " + history_array[i].get_obj().getquery() + ", " ; 
-			}
-			else {
-				and +=  history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", ";
-			}
-		}
-	}
-	if (and =="(") { and = "" ;}
-	else { and = and.substr(0,and.length -2) + ")";}
-	return and;
+    var i = 0;
+    var and = "(";
+    for(i; i < history_array.length;i++) {
+        if(history_array[i].get_type() == "Having") {
+            if (history_array[i].get_obj().get_operator() != 'None') {
+                and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator();
+                and += " " + history_array[i].get_obj().getquery() + ", " ; 
+            }
+            else {
+                and +=  history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", ";
+            }
+        }
+    }
+    if (and =="(") { and = "" ;}
+    else { and = and.substr(0,and.length -2) + ")";}
+    return and;
 }
 
+
+/**
+ * This function builds the orderby clause from the history object.
+ *
+ */
+
 function query_orderby() {
-	var i = 0;
-	var str = "" ;
-	for(i; i < history_array.length;i++) {
-		if(history_array[i].get_type() == "OrderBy") { str += history_array[i].get_column_name() + " , "; }
-	}
-	str = str.substr(0,str.length -1);
-	return str;
+    var i = 0;
+    var str = "" ;
+    for(i; i < history_array.length;i++) {
+        if(history_array[i].get_type() == "OrderBy") { str += history_array[i].get_column_name() + " , "; }
+    }
+    str = str.substr(0,str.length -1);
+    return str;
 }
 
+
+/**
+ * This function builds the Where clause from the history object.
+ *
+ */
+
 function query_where(){
-	var i = 0;
-	var and = "(";
-	var or = "(";
-	for(i; i < history_array.length;i++) {
-		if(history_array[i].get_type() == "Where") {
-			if(history_array[i].get_and_or() == 0) {
-				and += "( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() +" " + history_array[i].get_obj().getquery() + ")"; 		        and += " AND ";
-			}
-			else {
-				or +="( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() +")";                 or +=" OR " ;
-			}
-		}
-	}
-	if ( or != "(") {	or = or.substring(0,(or.length - 4 )) + ")"; }
-	else { or = "" ;}
-	if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; }
-	else {and = "" ;}
-	if ( or != "" ) { and = and + " OR " + or + " )"; }
-	return and;
+    var i = 0;
+    var and = "(";
+    var or = "(";
+    for(i; i < history_array.length;i++) {
+        if(history_array[i].get_type() == "Where") {
+            if(history_array[i].get_and_or() == 0) {
+                and += "( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() +" " + history_array[i].get_obj().getquery() + ")";                and += " AND ";
+            }
+            else {
+                or +="( " + history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() +")";
+                or +=" OR " ;
+            }
+        }
+    }
+    if ( or != "(") {	or = or.substring(0,(or.length - 4 )) + ")"; }
+    else { or = "" ;}
+    if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; }
+    else {and = "" ;}
+    if ( or != "" ) { and = and + " OR " + or + " )"; }
+    return and;
 }
 
 function check_aggregate(id_this) {
-	var i = 0;
-	for(i;i < history_array.length;i++) {
-		var temp = '`' + history_array[i].get_tab() + '`.`' +history_array[i].get_column_name() +'`';
-		if(temp == id_this && history_array[i].get_type() == "Aggregate") {
-			return history_array[i].get_obj().get_operator() + '(' + id_this +')';
-		}
-	}
-	return "";
+    var i = 0;
+    for(i;i < history_array.length;i++) {
+        var temp = '`' + history_array[i].get_tab() + '`.`' +history_array[i].get_column_name() +'`';
+        if(temp == id_this && history_array[i].get_type() == "Aggregate") {
+            return history_array[i].get_obj().get_operator() + '(' + id_this +')';
+        }
+    }
+    return "";
 }
 
 function check_rename(id_this) {
-	var i = 0;
-	for (i;i < history_array.length;i++) {
-		var temp = '`' + history_array[i].get_tab() + '`.`' +history_array[i].get_column_name() +'`';
-		if(temp == id_this && history_array[i].get_type() == "Rename") {
-			return  " AS `" + history_array[i].get_obj().getrename_to() +"`";
-		}
-	}
-	return "";
+    var i = 0;
+    for (i;i < history_array.length;i++) {
+        var temp = '`' + history_array[i].get_tab() + '`.`' +history_array[i].get_column_name() +'`';
+        if(temp == id_this && history_array[i].get_type() == "Rename") {
+            return  " AS `" + history_array[i].get_obj().getrename_to() +"`";
+        }
+    }
+    return "";
 }
+
 function gradient(id, level)
 {
-	var box = document.getElementById(id);
-	box.style.opacity = level;
-	box.style.MozOpacity = level;
-	box.style.KhtmlOpacity = level;
-	box.style.filter = "alpha(opacity=" + level * 100 + ")";
-	box.style.display="block";
-	return;
+    var box = document.getElementById(id);
+    box.style.opacity = level;
+    box.style.MozOpacity = level;
+    box.style.KhtmlOpacity = level;
+    box.style.filter = "alpha(opacity=" + level * 100 + ")";
+    box.style.display="block";
+    return;
 }
 
 
 function fadein(id) 
 {
-	var level = 0;
-	while(level <= 1)
-	{
-		setTimeout( "gradient('" + id + "'," + level + ")", (level* 1000) + 10);
-		level += 0.01;
-	}
+    var level = 0;
+    while(level <= 1){
+        setTimeout( "gradient('" + id + "'," + level + ")", (level* 1000) + 10);
+        level += 0.01;
+    }
 }
 
 function closebox()
 {
-   document.getElementById('box').style.display='none';
-   document.getElementById('filter').style.display='none';
+    document.getElementById('box').style.display='none';
+    document.getElementById('filter').style.display='none';
 }
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index 680c41dba..6fd158327 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -623,7 +623,6 @@ function Small_tab(t, re_load)
     var id      = document.getElementById('id_tbody_' + t);
     var id_this = document.getElementById('id_hide_tbody_' + t);
     var id_t    = document.getElementById(t);
-
     id_t.style.width = id_t.offsetWidth + 'px';
     if (id_this.innerHTML == "v") {
         //---CROSS
@@ -649,7 +648,6 @@ function Select_tab(t)
     //----------
     var id_t = document.getElementById(t);
     window.scrollTo(parseInt(id_t.style.left) - 300, parseInt(id_t.style.top) - 300);
-
     setTimeout(function(){document.getElementById('id_zag_' + t).className = 'tab_zag';}, 800);
 }
 //------------------------------------------------------------------------------
@@ -970,73 +968,75 @@ function getColorByTarget( target )
 
 function Click_option(id_this,column_name,table_name) 
 {
-	  var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1);
-     document.getElementById(id_this).style.left = left + 'px';
+    var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1);
+    document.getElementById(id_this).style.left = left + 'px';
     // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10;
-     document.getElementById(id_this).style.top  = (screen.height / 4) + 'px';
-     document.getElementById(id_this).style.visibility = "visible";
-	 document.getElementById('option_col_name').innerHTML = '<strong>Options For "' +column_name+ '" column</strong>';
-	 col_name = column_name;
-	 tab_name = table_name;
+    document.getElementById(id_this).style.top  = (screen.height / 4) + 'px';
+    document.getElementById(id_this).style.visibility = "visible";
+    document.getElementById('option_col_name').innerHTML = '<strong>Options For "' +column_name+ '" column</strong>';
+    col_name = column_name;
+    tab_name = table_name;
 }
 
 function Close_option()
 {
-	document.getElementById('pmd_optionse').style.visibility = "hidden";
+    document.getElementById('pmd_optionse').style.visibility = "hidden";
 }
 
 function Select_all(id_this,owner)
 {
-	var parent= document.form1;
-	downer =owner;
-	var i;
-	var tab = [];
-	for(i = 0; i < parent.elements.length; i++) {
-		if (parent.elements[i].type == "checkbox" && parent.elements[i].id.substring(0,(9 + id_this.length)) == 'select_' + id_this + '._') {
-			if(document.getElementById('select_all_' + id_this).checked == true) {
-				parent.elements[i].checked = true;
-				parent.elements[i].disabled = true;
-				var temp = '`' + id_this.substring(owner.length +1) + '`.*';
-			}	
-			else {
-				parent.elements[i].checked = false;
-				parent.elements[i].disabled = false;	
-			}
-		}
-	}
-	if(document.getElementById('select_all_' + id_this).checked == true) {
-		select_field.push('`' + id_this.substring(owner.length +1) + '`.*');
-		tab = id_this.split(".");
-		from_array.push(tab[1]);
-		
-	}
-	else {
-		for (i =0; i < select_field.length; i++) {
-			if (select_field[i] == ('`' + id_this.substring(owner.length +1) + '`.*')) {
-				select_field.splice(i,1);
-				
-			}
-		}
-		for(k =0 ;k < from_array.length;k++){
-			if(from_array[k] == id_this){ 
-				from_array.splice(k,1); 
-				break;
-			}
-		}
-	}
-	Re_load();
+    var parent= document.form1;
+    downer =owner;
+    var i;
+    var tab = [];
+    for(i = 0; i < parent.elements.length; i++) {
+        if (parent.elements[i].type == "checkbox" && parent.elements[i].id.substring(0,(9 + id_this.length)) == 'select_' + id_this + '._') {
+            if(document.getElementById('select_all_' + id_this).checked == true) {
+                parent.elements[i].checked = true;
+                parent.elements[i].disabled = true;
+                var temp = '`' + id_this.substring(owner.length +1) + '`.*';
+           }	
+           else {
+               parent.elements[i].checked = false;
+               parent.elements[i].disabled = false;	
+           }
+        }
+    }
+    if(document.getElementById('select_all_' + id_this).checked == true) {
+        select_field.push('`' + id_this.substring(owner.length +1) + '`.*');
+        tab = id_this.split(".");
+        from_array.push(tab[1]);
+    }
+    else {
+        for (i =0; i < select_field.length; i++) {
+            if (select_field[i] == ('`' + id_this.substring(owner.length +1) + '`.*')) {
+                select_field.splice(i,1);
+            }
+        }
+        for(k =0 ;k < from_array.length;k++){
+            if(from_array[k] == id_this){ 
+                from_array.splice(k,1); 
+                break;
+            }
+        }
+    }
+    Re_load();
 }
 
-function Table_onover(id_this,val)
+function Table_onover(id_this,val,buil)
 {
-	if(!val) {
-		document.getElementById("id_zag_" + id_this).className="tab_zag_2";
-		document.getElementById("id_zag_" + id_this + "_2").className="tab_zag_2";
-	}
-	else {
-		document.getElementById("id_zag_" + id_this).className="tab_zag";
-		document.getElementById("id_zag_" + id_this + "_2").className="tab_zag";
-	}
+    if(!val) {
+        document.getElementById("id_zag_" + id_this).className="tab_zag_2";
+        if(buil) {
+            document.getElementById("id_zag_" + id_this + "_2").className="tab_zag_2";
+        }
+    }
+    else {
+        document.getElementById("id_zag_" + id_this).className="tab_zag";
+        if(buil) {
+            document.getElementById("id_zag_" + id_this + "_2").className="tab_zag";
+        }
+    }
 }
 
 /* This function stores selected column information in select_field[]
@@ -1044,26 +1044,26 @@ function Table_onover(id_this,val)
  *
  */
 function store_column(id_this,owner,col) {
-	var i = 0;
-	var k = 0;
-	if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) {
-		select_field.push('`' + id_this + '`.`' + col +'`');	
-		from_array.push(id_this);
-	}
-	else {
-		for(i; i < select_field.length ;i++) {
-			if (select_field[i] == ('`' + id_this + '`.`' + col +'`')) {
-				select_field.splice(i,1);
-				break;
-			}
-		}
-		for(k =0 ;k < from_array.length;k++){
-			if(from_array[k] == id_this){ 
-				from_array.splice(k,1); 
-				break;
-			}
-		}
-	}
+    var i = 0;
+    var k = 0;
+    if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) {
+        select_field.push('`' + id_this + '`.`' + col +'`');	
+        from_array.push(id_this);
+    }
+    else {
+        for(i; i < select_field.length ;i++) {
+            if (select_field[i] == ('`' + id_this + '`.`' + col +'`')) {
+                select_field.splice(i,1);
+                break;
+            }
+        }
+        for(k =0 ;k < from_array.length;k++){
+            if(from_array[k] == id_this){ 
+                from_array.splice(k,1); 
+			    break;
+            }
+        }
+     }
 }
 
 /**
@@ -1080,67 +1080,66 @@ function store_column(id_this,owner,col) {
 **/
 
 function add_object() {
-	var rel = document.getElementById('rel_opt');
-	var sum = 0;
-	var init = history_array.length;
-	if (rel.value != '--') {
-		if (document.getElementById('Query').value == "") {
-			document.getElementById('hint').innerHTML = "value/subQuery is empty" ;
-		    document.getElementById('hint').style.visibility = "visible";
-			return;
-		}
-		 var p = document.getElementById('Query');
-		 var where_obj = new where(rel.value,p.value);//make where object
-		 history_array.push(new history(col_name,where_obj,tab_name,h_tabs[downer + '.' + tab_name],"Where"));
-		 sum = sum + 1;
-		 rel.value = '--';
-		 p.value = "";
-	}
-	if (document.getElementById('new_name').value !="") {
-		var rename_obj = new rename(document.getElementById('new_name').value);//make Rename object
-		history_array.push(new history(col_name,rename_obj,tab_name,h_tabs[downer + '.' + tab_name],"Rename"));
-		sum = sum + 1;
-		document.getElementById('new_name').value = "" ;
-	}
+    var rel = document.getElementById('rel_opt');
+    var sum = 0;
+    var init = history_array.length;
+    if (rel.value != '--') {
+        if (document.getElementById('Query').value == "") {
+            document.getElementById('hint').innerHTML = "value/subQuery is empty" ;
+            document.getElementById('hint').style.visibility = "visible";
+            return;
+        }
+        var p = document.getElementById('Query');
+        var where_obj = new where(rel.value,p.value);//make where object
+        history_array.push(new history(col_name,where_obj,tab_name,h_tabs[downer + '.' + tab_name],"Where"));
+        sum = sum + 1;
+        rel.value = '--';
+        p.value = "";
+    }
+    if (document.getElementById('new_name').value !="") {
+        var rename_obj = new rename(document.getElementById('new_name').value);//make Rename object
+        history_array.push(new history(col_name,rename_obj,tab_name,h_tabs[downer + '.' + tab_name],"Rename"));
+        sum = sum + 1;
+        document.getElementById('new_name').value = "" ;
+    }
 	if (document.getElementById('operator').value != '---') {
-		var aggregate_obj = new aggregate(document.getElementById('operator').value) ;
-		history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate"));
-		sum = sum + 1;
-		document.getElementById('operator').value = '---';
+        var aggregate_obj = new aggregate(document.getElementById('operator').value) ;
+        history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate"));
+        sum = sum + 1;
+        document.getElementById('operator').value = '---';
 		//make aggregate operator
-	}
-	if (document.getElementById('groupby').checked == true ) {
-		history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy"));
-		sum = sum + 1;
-		document.getElementById('groupby').checked = false;
-		//make groupby
-	}
-	if (document.getElementById('h_rel_opt').value != '--') {
-		if (document.getElementById('having').value == "") {
-			document.getElementById('hint').innerHTML = "value/subQuery is empty" ;
-		    document.getElementById('hint').style.visibility = "visible";
-			return;
-		}
-		 var p = document.getElementById('having');
-		 var where_obj = new having(document.getElementById('h_rel_opt').value,p.value,document.getElementById('h_operator').value);//make where object
-		 history_array.push(new history(col_name,where_obj,tab_name,h_tabs[downer + '.' + tab_name],"Having"));
-		 sum = sum + 1;
-		 document.getElementById('h_rel_opt').value = '--';
-		 document.getElementById('h_operator').value = '---';
-		 p.value = ""; //make having
-	}
-	if (document.getElementById('orderby').checked == true) {
-		history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy"));
-		sum = sum + 1;
-		document.getElementById('orderby').checked = false;
+    }
+    if (document.getElementById('groupby').checked == true ) {
+        history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy"));
+        sum = sum + 1;
+        document.getElementById('groupby').checked = false;
+	//make groupby
+    }
+    if (document.getElementById('h_rel_opt').value != '--') {
+        if (document.getElementById('having').value == "") {
+            document.getElementById('hint').innerHTML = "value/subQuery is empty" ;
+            document.getElementById('hint').style.visibility = "visible";
+           return;
+        }
+        var p = document.getElementById('having');
+        var where_obj = new having(document.getElementById('h_rel_opt').value,p.value,document.getElementById('h_operator').value);//make where object
+        history_array.push(new history(col_name,where_obj,tab_name,h_tabs[downer + '.' + tab_name],"Having"));
+        sum = sum + 1;
+        document.getElementById('h_rel_opt').value = '--';
+        document.getElementById('h_operator').value = '---';
+        p.value = ""; //make having
+    }
+    if (document.getElementById('orderby').checked == true) {
+        history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy"));
+        sum = sum + 1;
+        document.getElementById('orderby').checked = false;
 		//make orderby
-	}
-	document.getElementById('hint').innerHTML = sum + "object created" ;
+    }
+    document.getElementById('hint').innerHTML = sum + "object created" ;
     document.getElementById('hint').style.visibility = "visible";
 	//output sum new objects created
-	var existingDiv = document.getElementById('ab');
-	existingDiv.innerHTML = display(init,history_array.length);
-	Close_option();
-	panel(0);
-	
+    var existingDiv = document.getElementById('ab');
+    existingDiv.innerHTML = display(init,history_array.length);
+    Close_option();
+    panel(0);
 }
\ No newline at end of file
diff --git a/pmd_general.php b/pmd_general.php
index b7a1e1aad..7f698f6e0 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -114,11 +114,14 @@ echo $script_tabs . $script_contr . $script_display_field;
             class="M_butt" target="_self"
         ><img src="pmd/images/pdf.png" alt="key" width="20" height="20"
                 title="<?php echo __('Import/Export coordinates for PDF schema'); ?>" /></a
-         ><a href="#" onClick="build_query('SQL Query on Database', 0)" onmousedown="return false;" 
-            class="M_butt" target="_self"
-        ><img src="pmd/images/query_builder.png" alt="key" width="20" height="20"
-                title="<?php echo __('Build Query'); ?>" /></a
-        ><a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));"
+         >
+        <?php if($_REQUEST['query']){
+            echo '<a href="#" onClick="build_query(\'SQL Query on Database\', 0)" onmousedown="return false;" 
+            class="M_butt" target="_self">';
+            echo '<img src="pmd/images/query_builder.png" alt="key" width="20" height="20" title="';
+            echo __('Build Query');
+            echo '"/></a>'; }?> 
+         <a href="javascript:Top_menu_right(document.getElementById('key_Left_Right'));"
             onmousedown="return false;" class="M_butt last" target="_self">
             <img src="pmd/images/2rightarrow_m.png" id="key_Left_Right" alt=">"
                 title="<?php echo __('Move Menu'); ?>" /></a>
@@ -227,9 +230,9 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         onclick="Start_tab_upd('<?php echo $GLOBALS['PMD_URL']["TABLE_NAME_SMALL"][$i]; ?>');">
         <img src="pmd/images/exec_small.png" alt="" /></td>
     <td nowrap="nowrap" id="id_zag_<?php echo $t_n_url ?>" class="tab_zag"
-        onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"
-        onmouseover="Table_onover('<?php echo $t_n_url ?>',0)"
-        onmouseout="Table_onover('<?php echo $t_n_url ?>',1)">
+        onmousedown="cur_click=document.getElementById('<?php echo $t_n_url ?>');"/
+        onmouseover="Table_onover('<?php echo $t_n_url ?>',0,<?php echo (isset($_REQUEST['query'])? 1 : 0 )?> )"
+        onmouseout="Table_onover('<?php echo $t_n_url ?>',1,<?php echo (isset($_REQUEST['query']) ? 1 : 0 )?>)">
         <span class='owner'>
         <?php
         echo $GLOBALS['PMD_OUT']["OWNER"][$i];
@@ -238,9 +241,9 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         ?></td>
     <?php 
 	if(isset($_REQUEST['query'])) {
-		echo '<td class="tab_zag"  onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0)"  id="id_zag_'.htmlspecialchars($t_n_url).'_2"';
+		echo '<td class="tab_zag"  onmouseover="Table_onover(\''.htmlspecialchars($t_n_url).'\',0,1)"  id="id_zag_'.htmlspecialchars($t_n_url).'_2"';
         echo 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"';
-        echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1)">';
+        echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1,1)">';
 	}?>
 </tr>
 </thead>
@@ -810,15 +813,16 @@ if($_REQUEST['query']) {
 	echo '<div id="filter"></div>';
 	echo '<div id="box">';
   	echo '<span id="boxtitle"></span>';
-  	echo '<form method="GET" action="" target="_parent">';
+  	echo '<form method="post" action="pmd_general" target="_parent">';
     echo '<textarea cols="80" name="sql_query" id="textSqlquery" rows="15"></textarea><div id="tblfooter">';
-    echo '  <input type="submit" name="submit" class="btn">';
+    echo '  <input type="submit" name="submit_sql" class="btn">';
     echo '  <input type="button" name="cancel" value="Cancel" onClick="closebox()" class="btn">';
     echo '</div></p>';
     echo '</form></div>';
 	
 } ?>
 
+
 <!-- cache images -->
 <img src="pmd/images/2leftarrow_m.png" width="0" height="0" alt="" />
 <img src="pmd/images/rightarrow1.png" width="0" height="0" alt="" />