diff --git a/lang.inc.php b/lang.inc.php
index 1c097368..cb6dcdeb 100644
--- a/lang.inc.php
+++ b/lang.inc.php
@@ -32,7 +32,7 @@ function switch_lang() {
 }
 
 if (isset($_GET["lang"])) {
-	setcookie("lang", $_GET["lang"], strtotime("+1 month"));
+	setcookie("lang", $_GET["lang"], strtotime("+1 month"), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
 	$_COOKIE["lang"] = $_GET["lang"];
 }
 
diff --git a/sql.inc.php b/sql.inc.php
index f82e7341..b6088ae4 100644
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (isset($_POST["query"])) {
-	setcookie("highlight", $_POST["highlight"], strtotime("+1 month"));
+	setcookie("highlight", $_POST["highlight"], strtotime("+1 month"), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
 	$_COOKIE["highlight"] = $_POST["highlight"];
 }