diff --git a/ChangeLog b/ChangeLog
index 88aa27971..ee78f4711 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ $Source$
 
 2003-03-25 Michal Cihar  <nijel@users.sourceforge.net>
     * tbl_query_box.php3, tbl_properties_operations.php3,
-      libraries/common.lib.php3: More HTML entities fixes.
+      libraries/common.lib.php3, tbl_query_box.php3: More HTML entities fixes.
 
 2003-03-24 Michal Cihar  <nijel@users.sourceforge.net>
     * db_details_structure.php3, mult_submits.inc.php: Added CHECK TABLE to
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 383da9be6..837a15e2d 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -102,7 +102,7 @@ if (!isset($is_inside_querywindow) ||
         echo "\n";
         for ($i = 0 ; $i < $fields_cnt; $i++) {
             echo '                '
-                 . '<option value="' . urlencode($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
+                 . '<option value="' . htmlspecialchars($fields_list[$i]) . '">' . htmlspecialchars($fields_list[$i]) . '</option>' . "\n";
         }
     ?>
             </select>