diff --git a/ChangeLog b/ChangeLog
index 0d8a417a9..0964e356d 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
       Windows, thanks to Alex - nixniemand
     * libraries/mult_submits.inc.php, server_databases.php: array to string 
       conversion
+    * tbl_properties_operations.php, tbl_properties.php, tbl_import.php,
+      tbl_change.php: bug #1415465, undefined $sql_query
 
 2006-01-31 Marc Delisle  <lem9@users.sourceforge.net>
     * db_details_structure.php: bug #1412058, damaged table reporting
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 4074a564a..f33e09c34 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1875,7 +1875,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
 
         $tab = array_merge($defaults, $tab);
 
-        // determine aditional style-class
+        // determine additionnal style-class
         if (empty($tab['class'])) {
             if ($tab['text'] == $GLOBALS['strEmpty']
                 || $tab['text'] == $GLOBALS['strDrop']) {
@@ -1927,7 +1927,7 @@ window.parent.updateTableTitle('<?php echo $uni_tbl; ?>', '<?php echo PMA_jsForm
         }
 
         return $out;
-    } // end of the 'PMA_printTab()' function
+    } // end of the 'PMA_getTab()' function
 
     /**
      * returns html-code for a tab navigation
diff --git a/tbl_change.php b/tbl_change.php
index 1f5be6ebc..b5c3fbe7e 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -79,7 +79,8 @@ if (!empty($disp_message)) {
 if (!isset($goto)) {
     $goto    = 'db_details.php';
 }
-if (!preg_match('@^(db_details|tbl_properties|tbl_select)@', $goto)) {
+// TODO: check if we could replace by "db_details|tbl"
+if (!preg_match('@^(db_details|tbl_properties|tbl_select|tbl_import)@', $goto)) {
     $err_url = $goto . "?" . PMA_generate_common_url($db) . "&amp;sql_query=" . urlencode($sql_query);
 } else {
     $err_url = $goto . '?'
diff --git a/tbl_import.php b/tbl_import.php
index bd4558243..eade040bc 100644
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -8,6 +8,8 @@ require_once('./libraries/common.lib.php');
  * Gets tables informations and displays top links
  */
 require_once('./libraries/tbl_properties_common.php');
+$url_query .= '&amp;goto=tbl_import.php&amp;back=tbl_import.php';
+
 require_once('./libraries/tbl_properties_table_info.inc.php');
 /**
  * Displays top menu links
diff --git a/tbl_properties.php b/tbl_properties.php
index 119ed297a..873771ba0 100644
--- a/tbl_properties.php
+++ b/tbl_properties.php
@@ -8,6 +8,8 @@ require_once('./libraries/common.lib.php');
  * Runs common work
  */
 require('./libraries/tbl_properties_common.php');
+$url_query .= '&amp;goto=tbl_properties.php&amp;back=tbl_properties.php';
+
 require_once('./libraries/sql_query_form.lib.php');
 
 $err_url   = 'tbl_properties.php' . $err_url;
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index b5b23035b..3a6c8e2e6 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -8,6 +8,7 @@ require_once('./libraries/common.lib.php');
  * Runs common work
  */
 require('./libraries/tbl_properties_common.php');
+$url_query .= '&amp;goto=tbl_properties_operations.php&amp;back=tbl_properties_operations.php';
 
 /**
  * Gets relation settings