diff --git a/db_structure.php b/db_structure.php
index 1c3a40f15..284ab26f6 100644
--- a/db_structure.php
+++ b/db_structure.php
@@ -149,13 +149,13 @@ function PMA_SortableTableHeader($title, $sort)
     if ($requested_sort == $sort) {
         if ($requested_sort_order == 'ASC') {
             $sort_order = 'DESC';
-            $order_img  = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="soimg' . $i . '" />';
-            $order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
-            $order_link_params['onmouseout']  = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
+            $order_img  = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_desc.png" width="11" height="9" alt="'. $GLOBALS['strDescending'] . '" title="'. $GLOBALS['strDescending'] . '" id="sort_arrow" />';
+            $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
+            $order_link_params['onmouseout']  = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
         } else {
-            $order_img  = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="soimg' . $i . '" />';
-            $order_link_params['onmouseover'] = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
-            $order_link_params['onmouseout']  = 'if(document.getElementById(\'soimg' . $i . '\')){ document.getElementById(\'soimg' . $i . '\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
+            $order_img  = ' <img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 's_asc.png" width="11" height="9" alt="'. $GLOBALS['strAscending'] . '" title="'. $GLOBALS['strAscending'] . '" id="sort_arrow" />';
+            $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }';
+            $order_link_params['onmouseout']  = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }';
         }
     }
 
@@ -219,11 +219,11 @@ $_url_params = array(
     'db'  => $db);
 
 // Add the sort options if they exists
-if ($_REQUEST['sort']) {
+if (isset($_REQUEST['sort'])) {
     $_url_params['sort'] = $_REQUEST['sort'];
 }
 
-if ($_REQUEST['sort_order']) {
+if (isset($_REQUEST['sort_order'])) {
     $_url_params['sort_order'] = $_REQUEST['sort_order'];
 }
 
diff --git a/libraries/db_info.inc.php b/libraries/db_info.inc.php
index 161386abd..a7e2e286e 100644
--- a/libraries/db_info.inc.php
+++ b/libraries/db_info.inc.php
@@ -199,10 +199,10 @@ if (true === $cfg['SkipLockedTables']) {
 if (! isset($sot_ready)) {
 
     // Set some sorting defaults
-    $sort = 'name';
+    $sort = 'Name';
     $sort_order = 'ASC';
 
-    if ($_REQUEST['sort']) {
+    if (isset($_REQUEST['sort'])) {
         $sortable_name_mappings = array(
             'table'     => 'Name',
             'records'   => 'Rows',