diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index a68f4746a..a8a38cd21 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -965,3 +965,43 @@ function getColorByTarget( target )
 
   return color;    
 }
+
+function Click_option(id_this) 
+{
+	 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";
+}
+
+function Close_option()
+{
+	document.getElementById('pmd_options').style.visibility = "hidden";
+}
+
+function Select_all(id_this)
+{
+	var parent= document.form1;
+	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)
+					parent.elements[i].checked = true;
+				else
+					parent.elements[i].checked = false;
+		}
+	}
+	Re_load();
+}
+
+function Table_onover(id_this,val)
+{
+	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";
+	}
+}
\ No newline at end of file
diff --git a/pmd/styles/default/style1.css b/pmd/styles/default/style1.css
index b4f7ec33b..26e85e90e 100644
--- a/pmd/styles/default/style1.css
+++ b/pmd/styles/default/style1.css
@@ -147,6 +147,23 @@ form {
     color: #888888;
 }
 
+.option_tab {
+	padding-left: 2px;
+	padding-right: 2px;
+	width: 5px;
+}
+
+.select_all {
+	vertical-align: top;
+	padding-left: 2px;
+	padding-right: 2px;
+	cursor: default;
+	width: 1px;
+	color: #000000;
+	background-image: url(images/Header.png);
+    background-repeat: repeat-x;
+}
+
 .small_tab {
     vertical-align: top;
     background-color: #0064ea;
@@ -372,6 +389,14 @@ a.M_butt:hover {
     width: 153px;
 }
 
+#pmd_optionse {
+    position: absolute;
+    left: 636px;
+    top: 85px;
+    z-index: 1000;
+    width: 153px;
+}
+
 #layer_menu_sizer {
     background-image: url(../../images/resize.png);
     cursor: nw-resize;
diff --git a/pmd_general.php b/pmd_general.php
index 89988ddfa..1beadf139 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -187,6 +187,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
          ">
 <thead>
 <tr>
+    <?php 
+	if(isset($_REQUEST['query'])) {
+		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>';
+	}?>
     <td class="small_tab" onmouseover="this.className='small_tab2';"
         onmouseout="this.className='small_tab';"
         id="id_hide_tbody_<?php echo $t_n_url ?>"
@@ -205,14 +212,20 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $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="this.className = 'tab_zag_2'"
-        onmouseout="this.className = 'tab_zag'">
+        onmouseover="Table_onover('<?php echo $t_n_url ?>',0)"
+        onmouseout="Table_onover('<?php echo $t_n_url ?>',1)">
         <span class='owner'>
         <?php
         echo $GLOBALS['PMD_OUT']["OWNER"][$i];
         echo '.</span>';
         echo $GLOBALS['PMD_OUT']["TABLE_NAME_SMALL"][$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 'onmousedown="cur_click=document.getElementById(\''.htmlspecialchars($t_n_url).'\');"';
+        echo 'onmouseout="Table_onover(\''.htmlspecialchars($t_n_url).'\',1)">';
+	}?>
 </tr>
 </thead>
 <tbody id="id_tbody_<?php echo $t_n_url ?>"
@@ -243,6 +256,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
             echo (isset($tables_all_keys[$t_n.".".$tab_column[$t_n]["COLUMN_NAME"][$j]]) ? 1 : 0);
         }
         ?>)">
+    <?php 
+	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>';
+	}?>
     <td width="10px" colspan="3"
         id="<?php echo $t_n_url.".".urlencode($tab_column[$t_n]["COLUMN_NAME"][$j]) ?>">
         <div style="white-space:nowrap">
@@ -276,6 +296,13 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
         ?>
         </div>
    </td>
+   <?php 
+   if(isset($_REQUEST['query'])) {
+	   echo '<td class="small_tab_pref" onmouseover="this.className=\'small_tab_pref2\';"';
+	   echo 'onmouseout="this.className=\'small_tab_pref\';"';
+	   echo 'onclick="Click_option(\'pmd_optionse\')" >';
+	   echo  '<img src="pmd/images/exec_small.png" title="options" alt="" /></td> ';
+	} ?>
 </tr>
         <?php
     }
@@ -390,6 +417,95 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
 </tr>
 </tbody>
 </table>
+
+<table id="pmd_optionse" style="visibility:<?php echo $hidden ?>;"
+    width="5%" border="0" cellpadding="0" cellspacing="0">
+<tbody>
+<tr>
+    <td class="frams1" width="10px"></td>
+    <td class="frams5" width="99%" ></td>
+    <td class="frams2" width="10px"><div class="bor"></div></td>
+</tr>
+<tr>
+    <td class="frams8"></td>
+    <td class="input_tab">
+        <table width="168" border="0" align="center" cellpadding="2" cellspacing="0">
+        <thead>
+        <tr>
+            <td colspan="2" align="center" nowrap="nowrap"><strong>Options</strong></td>
+        </tr>
+        </thead>
+        <tbody id="where">
+        <tr><td align="center" nowrap="nowrap"><b>Where</b></td></tr>
+        <tr>
+            <td width="58" nowrap="nowrap">Relation operator</td>
+            <td width="102"><select name="rel_opt" id="rel_opt">
+                    <option value="--" selected="selected"> -- </option>
+                    <option value="=" > = </option>
+                    <option value=">"> > </option>
+                    <option value="<"> < </option>
+                    <option value=">="> >= </option>
+                    <option value="<="> <= </option>
+                    <option value="NOT"> NOT </option>
+                    <option value="IN"> IN </option>
+                    <option value="EXCEPT"> Except </option>
+                    <option value="NOT IN"> Not In </option>
+                </select>
+            </td>
+        </tr>
+        <tr>
+            <td nowrap="nowrap">Value/<br />Subquery</td>
+            <td><textarea name="Query" value=" " cols="15"></textarea>
+            </td>
+        </tr>
+        <tr><td align="center" nowrap="nowrap"><b>Rename To</b></td></tr>
+        <tr>
+            <td width="58" nowrap="nowrap">New Name</td>
+        	<td width="102"><input type="text" value="" /></td>
+        </tr>
+        <tr><td align="center" nowrap="nowrap"><b>Aggregate</b></td></tr>   
+         <tr>
+         <td width="58" nowrap="nowrap">Operator</td>
+            <td width="102"><select name="operator" id="operator">
+                    <option value="---" selected="selected">---</option>
+                    <option value="sum" > Sum </option>
+                    <option value="min"> Min </option>
+                    <option value="max"> Max </option>
+                    <option value="avg"> Avg </option>
+                    <option value="avg"> Count </option>
+                    </select>
+           </td></tr>
+           <tr>
+				<td nowrap="nowrap" width="58" align="center"><b>Group By</b></td>
+                <td><input type="checkbox" value="groupby" /></td>
+           </tr>           	
+           <tr>
+				<td nowrap="nowrap" width="58" align="center"><b>Order By</b></td>
+                <td><input type="checkbox" value="orderby" /></td>
+           </tr>
+        </tbody>
+        <tbody>
+        <tr>
+            <td colspan="2" align="center" nowrap="nowrap">
+                <input type="button" class="butt" name="Button"
+                    value="<?php echo __('OK'); ?>" onclick="New_relation()" />
+                <input type="button" class="butt" name="Button"
+                    value="<?php echo __('Cancel'); ?>"
+                    onclick="document.getElementById('pmd_optionse').style.visibility = 'hidden';" />
+            </td>
+        </tr>
+        </tbody>
+        </table>
+    </td>
+    <td class="frams6"></td>
+</tr>
+<tr>
+    <td class="frams4"><div class="bor"></div></td>
+    <td class="frams7"></td>
+    <td class="frams3"></td>
+</tr>
+</tbody>
+</table>
 <!-- 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="" />