diff --git a/ChangeLog b/ChangeLog
index 876d28ffb..61cd66a92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,15 +5,13 @@ phpMyAdmin - ChangeLog
 $Id$
 $HeadURL$
 
-2.10.1
-======
+2.10.1.0 (not released yet)
+=====================
+
+- bug #1541147 [js] '#' in database names not correctly handled by queywindow.js
 - bug #1671403 [parser] using "client" as table name
-
-2007-03-02 Marc Delisle  <lem9@users.sourceforge.net>
-    * server_status.php: use PMA_getenv('PHP_SELF'), thanks to Sebastian
-
-2007-03-02 Sebastian Mendel <cybot_tm@users.sourceforge.net>
-    * libraries/common.lib.php: bug #1672379 Call to undefined function PMA_removeCookie()
+- bug #1672379 [core] Call to undefined function PMA_removeCookie()
+. [general] use PMA_getenv('PHP_SELF')
 
 2007-03-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/common.lib.php: bug #1671813 CVE-2006-1549 deep recursion crash
@@ -126,9 +124,6 @@ $HeadURL$
       thanks to Ivan Kirillov
     ### 2.10.0-beta1 released from QA_2_10
 
-2007-01-29 Sebastian Mendel <cybot_tm@users.sourceforge.net>
-    * js/querywindow.js: fixed bug #1541147 - # in database names
-
 2007-01-26 Michal Čihař  <michal@cihar.com>
     * libraries/common.lib.php, libraries/js_escape.lib.php,
       test/escape_js_string.php, test/core.lib.php: Move java script escaping
diff --git a/js/querywindow.js b/js/querywindow.js
index dfd2a0f3b..713b7cee0 100644
--- a/js/querywindow.js
+++ b/js/querywindow.js
@@ -71,20 +71,20 @@ function refreshMain(url) {
             url = 'main.php';
         }
     }
-    goTo( url + '?server=' + server +
-        '&db=' + db +
-        '&table=' + table +
-        '&lang=' + lang +
-        '&collation_connection=' + collation_connection,
+    goTo(url + '?server=' + encodeURIComponent(server) +
+        '&db=' + encodeURIComponent(db) +
+        '&table=' + encodeURIComponent(table) +
+        '&lang=' + encodeURIComponent(lang) +
+        '&collation_connection=' + encodeURIComponent(collation_connection),
         'main' );
 }
 
 function refreshNavigation() {
-    goTo('navigation.php?server=' + server +
-        '&db=' + db +
-        '&table=' + table +
-        '&lang=' + lang +
-        '&collation_connection=' + collation_connection
+    goTo('navigation.php?server=' + encodeURIComponent(server) +
+        '&db=' + encodeURIComponent(db)  +
+        '&table=' + encodeURIComponent(table) +
+        '&lang=' + encodeURIComponent(lang) +
+        '&collation_connection=' + encodeURIComponent(collation_connection)
         );
 }
 
@@ -247,7 +247,7 @@ function insertQuery() {
 
 function open_querywindow( url ) {
     if ( ! url ) {
-        url = 'querywindow.php?' + common_query + '&db=' + db + '&table=' + table;
+        url = 'querywindow.php?' + encodeURIComponent(common_query) + '&db=' + encodeURIComponent(db) + '&table=' + encodeURIComponent(table);
     }
 
     if (!querywindow.closed && querywindow.location) {