diff --git a/srv/static/js/packagesearchpage.js b/srv/static/js/packagesearchpage.js
index 7111a5c..1203690 100644
--- a/srv/static/js/packagesearchpage.js
+++ b/srv/static/js/packagesearchpage.js
@@ -35,7 +35,7 @@ export function initPackageSearch(sectionElement, sectionData, newParams)
         }
         return true;
     }
-    const searchParams = SinglePageHelper.sections['package-search'].state.params = newParams[0];
+    const searchParams = sectionData.state.params = newParams[0];
     if (currentParams === searchParams) {
         return true;
     }
@@ -60,10 +60,9 @@ function fillBuildActionFromPackageSearch()
 
 function searchForPackagesFromParams(searchParams)
 {
-    const params = new URLSearchParams(searchParams);
     const form = document.getElementById('package-search-form');
     form.reset();
-    params.forEach(function(value, key) {
+    for (const [key, value] of Object.entries(Utils.hashAsObject(searchParams))) {
         const formElement = form[key];
         if (!formElement) {
             return;
@@ -78,7 +77,7 @@ function searchForPackagesFromParams(searchParams)
         } else {
             formElement.value = value;
         }
-    });
+    }
     const res = AjaxHelper.startFormQueryEx('package-search-form', showPackageSearchResults);
     SinglePageHelper.sections['package-search'].state.params = res.params;
     return res;
diff --git a/srv/static/js/utils.js b/srv/static/js/utils.js
index 986cb34..0c75254 100644
--- a/srv/static/js/utils.js
+++ b/srv/static/js/utils.js
@@ -9,10 +9,10 @@ export function splitHashParts()
     return hashParts;
 }
 
-export function hashAsObject()
+export function hashAsObject(hash)
 {
     const hashObject = {};
-    location.hash.substr(1).split('&').forEach(function(hashPart) {
+    (hash || location.hash.substr(1)).split('&').forEach(function(hashPart) {
         const parts = hashPart.split('=', 2);
         if (parts.length < 1) {
             return;