diff --git a/static/skin/index.js b/static/skin/index.js
index 08a8dccee..8f5ed557b 100644
--- a/static/skin/index.js
+++ b/static/skin/index.js
@@ -282,7 +282,7 @@
                     kiwixHomeBody.setAttribute('style', 'display: flex; justify-content: center; align-items: center');
                     divTag.getElementsByTagName('a')[0].onclick = (event) => {
                         event.preventDefault();
-                        window.history.pushState({}, null, `${window.location.href.split('?')[0]}?lang=`);
+                        window.history.pushState({}, null, `?lang=`);
                         setCookie(filterCookieName, 'lang=');
                         resetAndFilter();
                         document.querySelectorAll('.filter').forEach(filter => {
@@ -355,7 +355,7 @@
         params = new URLSearchParams(window.location.search);
         if (filterType) {
             params.set(filterType, filterValue);
-            window.history.pushState({}, null, `${window.location.href.split('?')[0]}?${params.toString()}`);
+            window.history.pushState({}, null, `?${params.toString()}`);
             setCookie(filterCookieName, params.toString());
         }
         updateFilterColors();
@@ -429,7 +429,7 @@
             filter.addEventListener('change', () => {resetAndFilter(filter.name, filter.value)});
         });
         if (filters) {
-            window.history.pushState({}, null, `${window.location.href.split('?')[0]}?${params.toString()}`);
+            window.history.pushState({}, null, `?${params.toString()}`);
         }
         updateVisibleParams();
         document.getElementById('kiwixSearchForm').onsubmit = (event) => {event.preventDefault()};
diff --git a/test/server.cpp b/test/server.cpp
index 9d7c38293..12909fe64 100644
--- a/test/server.cpp
+++ b/test/server.cpp
@@ -184,7 +184,7 @@ R"EXPECTEDRESULT(      src="/ROOT/skin/jquery-ui/external/jquery/jquery.js?cache
           src: url("/ROOT/skin/fonts/Roboto.ttf?cacheid=84d10248") format("truetype");
     <script src="/ROOT/skin/isotope.pkgd.min.js?cacheid=2e48d392" defer></script>
     <script src="/ROOT/skin/iso6391To3.js?cacheid=ecde2bb3"></script>
-    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=31ffa1f7" defer></script>
+    <script type="text/javascript" src="/ROOT/skin/index.js?cacheid=a4b8af39" defer></script>
 )EXPECTEDRESULT"
     },
     {