diff --git a/lib.inc.php3 b/lib.inc.php3
index fb3d24e79..06a0b10a1 100755
--- a/lib.inc.php3
+++ b/lib.inc.php3
@@ -488,10 +488,14 @@ if (!defined('__LIB_INC__')){
         // Reloads the navigation frame via JavaScript if required
         if (!empty($GLOBALS['reload']) && ($GLOBALS['reload'] == 'true')) {
             echo "\n";
+            $reload_url = './left.php3'
+                        . '?lang=' . $GLOBALS['lang']
+                        . '&server=' . $GLOBALS['server']
+                        . ((!empty($GLOBALS['db'])) ? '&db=' . urlencode($GLOBALS['db']) : '');
             ?>
 <script type="text/javascript" language="javascript1.2">
 <!--
-window.parent.frames['nav'].location.replace('./left.php3?lang=<?php echo $GLOBALS['lang']; ?>&server=<?php echo $GLOBALS['server']; ?>&db=<?php echo urlencode($GLOBALS['db']); ?>');
+window.parent.frames['nav'].location.replace('<?php echo $reload_url; ?>');
 //-->
 </script>
             <?php
diff --git a/main.php3 b/main.php3
index 87532a2f2..03a6f445e 100755
--- a/main.php3
+++ b/main.php3
@@ -6,6 +6,14 @@
  * Gets some core libraries and displays a top message if required
  */
 require('./grab_globals.inc.php3');
+// Handles some variables that may have been sent by the calling script
+if (isset($db)) {
+    unset($db);
+}
+if (isset($table)) {
+    unset($table);
+}
+$show_query = 'y';
 require('./header.inc.php3');
 if (isset($message)) {
     show_message($message);