diff --git a/tbl_zoom_select.php b/tbl_zoom_select.php
index 11754b8d68..cf8a64f90c 100644
--- a/tbl_zoom_select.php
+++ b/tbl_zoom_select.php
@@ -133,7 +133,7 @@ for ($i = 0; $i < 4; $i++) {
     if ($i == 2) {
         echo "<tr><td>";
         echo __("Additional search criteria");
-        echo "</td><tr>";
+        echo "</td></tr>";
     }
 ?>
     <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; $odd_row = ! $odd_row; ?>">
@@ -229,17 +229,17 @@ for ($i = 0; $i < 4; $i++) {
         <?php
     } ?>
 
-        </td>
     </tr>
 
-    <input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>"
+    <tr><td><input type="hidden" name="types[<?php echo $i; ?>]" id="types_<?php echo $i; ?>"
         value="<?php if(isset($tbl_fields_type[$i]))echo $tbl_fields_type[$i]; ?>" />
     <input type="hidden" name="collations[<?php echo $i; ?>]"
-        value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" />
+        value="<?php if(isset($tbl_fields_collation[$i]))echo $tbl_fields_collation[$i]; ?>" /></td></tr>
 
 <?php
 }//end for
 ?>
+    </tbody>
     </table>
 
 <?php
@@ -255,7 +255,7 @@ if (isset($zoom_submit) && $inputs[0] != 'pma_null' && $inputs[1] != 'pma_null')
 }
 ?>
     <table class="data">
-    <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label>&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp</td>
+    <tr><td><label for="dataLabel"><?php echo __("Data Label"); ?></label></td>
     <td><select name="dataLabel" id='dataLabel' >
         <option value = ''> <?php echo __('None');  ?> </option>
 <?php
@@ -293,6 +293,7 @@ echo '" /></td></tr>';
     <input type="submit" name="zoom_submit" id="inputFormSubmitId" value="<?php echo __('Go'); ?>" />
 </fieldset>
 </form>
+</fieldset>
 
 <?php