diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 02d3da98..7b6050f9 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -485,10 +485,9 @@ username.form['auth[driver]'].onchange();
 	*/
 	function messageQuery($query) {
 		global $jush;
-		static $count = 0;
 		restart_session();
-		$id = "sql-" . ($count++);
 		$history = &get_session("queries");
+		$id = "sql-" . count($history[$_GET["db"]]);
 		if (strlen($query) > 1e6) {
 			$query = ereg_replace('[\x80-\xFF]+$', '', substr($query, 0, 1e6)) . "\n..."; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 		}
diff --git a/changes.txt b/changes.txt
index 0aa18dc2..784425ea 100644
--- a/changes.txt
+++ b/changes.txt
@@ -9,7 +9,7 @@ Explain partitions in SQL query (bug #3600150)
 Allow loading more data with inline edit (bug #3605531)
 Stay on the same page after deleting rows (bug #3605845)
 Respect checked tables in export filename (bug #3245464)
-Handle max_input_vars
+Respect PHP configuration max_input_vars
 Open database to a new window after selecting it with Ctrl
 Disable autocapitalize in identifiers on mobile browsers
 MySQL: Compatibility with MySQL 5.6