diff --git a/ChangeLog b/ChangeLog
index d82c8296b..ba8c0d638 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $Source$
       - messages are now displayed if a query had been submitted to change some
         options or to sort the table;
       - pursuit the "stay on the sub-pages as long as needed" work.
+    * db_details.php3; db_details_export.php3; db_details_strucuture.php3:
+      pursuit the "stay on the sub-pages as long as needed" work.
 
 2002-05-02 Loïc Chapeaux  <lolo@phpheaven.net>
     * lang/*.inc.php3: cleanup.
diff --git a/db_details.php3 b/db_details.php3
index 18bcb194e..4e95e53c1 100755
--- a/db_details.php3
+++ b/db_details.php3
@@ -2,16 +2,16 @@
 /* $Id$ */
 
 
+/**
+ * Runs common work
+ */
 require('./db_details_common.php3');
+$url_query .= '&amp;goto=db_details.php3';
 
 
 /**
  * Database work
  */
-$url_query = 'lang=' . $lang
-           . '&amp;server=' . $server
-           . '&amp;db=' . urlencode($db)
-           . '&amp;goto=db_details.php3';
 if (isset($show_query) && $show_query == 'y') {
     // This script has been called by read_dump.php3
     if (isset($sql_query_cpy)) {
diff --git a/db_details_export.php3 b/db_details_export.php3
index 45ff2566b..796d3bc57 100644
--- a/db_details_export.php3
+++ b/db_details_export.php3
@@ -5,8 +5,9 @@
 /**
  * Gets some core libraries
  */
-$sub_part = '_export';
+$sub_part  = '_export';
 require('./db_details_common.php3');
+$url_query .= '&amp;goto=db_details_export.php3';
 require('./db_details_db_info.php3');
 
 
diff --git a/db_details_structure.php3 b/db_details_structure.php3
index ab2d11acd..2a4f4c375 100644
--- a/db_details_structure.php3
+++ b/db_details_structure.php3
@@ -3,10 +3,12 @@
 
 
 /**
- * Prepares the tables list
+ * Prepares the tables list if the user where not redirected to this script
+ * because there is no table in the database ($is_info is TRUE)
  */
 if (empty($is_info)) {
    include('./db_details_common.php3');
+   $url_query .= '&amp;goto=db_details_structure.php3';
 
    //Drop/delete multiple tables if required
    if ((!empty($submit_mult) && isset($selected_tbl))
@@ -59,19 +61,15 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
 </tr>
     <?php
     $i = $sum_entries = $sum_size = 0;
-    $checked = (!empty($checkall) ? ' checked="checked"' : '');
+    $checked   = (!empty($checkall) ? ' checked="checked"' : '');
     while (list($keyname, $sts_data) = each($tables)) {
         $table         = $sts_data['Name'];
         $table_encoded = urlencode($table);
         $table_name    = htmlspecialchars($table);
 
         // Sets parameters for links
-        $url_query = 'lang=' . $lang
-                   . '&amp;server=' . $server
-                   . '&amp;db=' . urlencode($db)
-                   . '&amp;table=' . $table_encoded
-                   . '&amp;goto=db_details_structure.php3';
-        $bgcolor   = ($i++ % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
+        $tbl_url_query = $url_query . '&amp;table=' . $table_encoded;
+        $bgcolor       = ($i++ % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
         echo "\n";
         ?>
 <tr>
@@ -84,7 +82,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
     <td bgcolor="<?php echo $bgcolor; ?>">
         <?php
         if (!empty($sts_data['Rows'])) {
-            echo '<a href="sql.php3?' . $url_query . '&amp;sql_query='
+            echo '<a href="sql.php3?' . $tbl_url_query . '&amp;sql_query='
                  . urlencode('SELECT * FROM ' . PMA_backquote($table))
                  . '&amp;pos=0">' . $strBrowse . '</a>';
         } else {
@@ -95,7 +93,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
     <td bgcolor="<?php echo $bgcolor; ?>">
         <?php
         if (!empty($sts_data['Rows'])) {
-            echo '<a href="tbl_select.php3?' . $url_query . '">'
+            echo '<a href="tbl_select.php3?' . $tbl_url_query . '">'
                  . $strSelect . '</a>';
         } else {
             echo $strSelect;
@@ -103,22 +101,22 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
         ?>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_change.php3?<?php echo $url_query; ?>">
+        <a href="tbl_change.php3?<?php echo $tbl_url_query; ?>">
             <?php echo $strInsert; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_properties.php3?<?php echo $url_query; ?>">
+        <a href="tbl_properties.php3?<?php echo $tbl_url_query; ?>">
             <?php echo $strProperties; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
+        <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
             onclick="return confirmLink(this, 'DROP TABLE <?php echo PMA_jsFormat($table); ?>')">
             <?php echo $strDrop; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
         <?php
         if (!empty($sts_data['Rows'])) {
-            echo '<a href="sql.php3?' . $url_query
+            echo '<a href="sql.php3?' . $tbl_url_query
                  . '&amp;sql_query=';
             if (PMA_MYSQL_INT_VERSION >= 40000) {
                 echo urlencode('TRUNCATE ' . PMA_backquote($table))
@@ -199,7 +197,7 @@ else if (PMA_MYSQL_INT_VERSION >= 32303) {
                 ?>
     <td align="right" bgcolor="<?php echo $bgcolor; ?>" nowrap="nowrap">
         &nbsp;&nbsp;
-        <a href="tbl_properties.php3?<?php echo $url_query; ?>#showusage"><?php echo $formated_size . ' ' . $unit; ?></a>
+        <a href="tbl_properties.php3?<?php echo $tbl_url_query; ?>#showusage"><?php echo $formated_size . ' ' . $unit; ?></a>
     </td>
                 <?php
                 echo "\n";
@@ -324,12 +322,8 @@ else {
         $table_name    = htmlspecialchars($table);
 
         // Sets parameters for links
-        $url_query = 'lang=' . $lang
-                   . '&amp;server=' . $server
-                   . '&amp;db=' . urlencode($db)
-                   . '&amp;table=' . $table_encoded
-                   . '&amp;goto=db_details_structure.php3';
-        $bgcolor   = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
+        $tbl_url_query = $url_query . '&amp;table=' . $table_encoded;
+        $bgcolor       = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
         echo "\n";
         ?>
 <tr>
@@ -340,22 +334,22 @@ else {
         <b>&nbsp;<label for="checkbox_tbl_<?php echo $i; ?>"><?php echo $table_name; ?></label>&nbsp;</b>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0"><?php echo $strBrowse; ?></a>
+        <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;sql_query=<?php echo urlencode('SELECT * FROM ' . PMA_backquote($table)); ?>&amp;pos=0"><?php echo $strBrowse; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_select.php3?<?php echo $url_query; ?>"><?php echo $strSelect; ?></a>
+        <a href="tbl_select.php3?<?php echo $tbl_url_query; ?>"><?php echo $strSelect; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_change.php3?<?php echo $url_query; ?>"><?php echo $strInsert; ?></a>
+        <a href="tbl_change.php3?<?php echo $tbl_url_query; ?>"><?php echo $strInsert; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="tbl_properties.php3?<?php echo $url_query; ?>"><?php echo $strProperties; ?></a>
+        <a href="tbl_properties.php3?<?php echo $tbl_url_query; ?>"><?php echo $strProperties; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, $table_name)); ?>"><?php echo $strDrop; ?></a>
+        <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, $table_name)); ?>"><?php echo $strDrop; ?></a>
     </td>
     <td bgcolor="<?php echo $bgcolor; ?>">
-        <a href="sql.php3?<?php echo $url_query; ?>&amp;sql_query=<?php echo urlencode('DELETE FROM ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, $table_name)); ?>"><?php echo $strEmpty; ?></a>
+        <a href="sql.php3?<?php echo $tbl_url_query; ?>&amp;sql_query=<?php echo urlencode('DELETE FROM ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenEmptied, $table_name)); ?>"><?php echo $strEmpty; ?></a>
     </td>
     <td align="right" bgcolor="<?php echo $bgcolor; ?>">
         <?php PMA_countRecords($db, $table); echo "\n"; ?>