diff --git a/cpone-dashboard/templates/arrival/index.html b/cpone-dashboard/templates/arrival/index.html
index f8a19ea..2a35286 100644
--- a/cpone-dashboard/templates/arrival/index.html
+++ b/cpone-dashboard/templates/arrival/index.html
@@ -245,7 +245,7 @@
   <div id="arrival-load-more" class="px-4 pb-4">
     {{if .HasMore}}
     <div
-      hx-get='{{b "/arrival/list"}}?date={{.Date}}&search={{.Search}}&paket={{.Paket}}&dept={{.Department}}&page={{.NextPage}}'
+      hx-get='{{b "/arrival/list"}}?date={{urlquery .Date}}&search={{urlquery .Search}}&paket={{urlquery .Paket}}&dept={{urlquery .Department}}&page={{.NextPage}}'
       hx-trigger="revealed"
       hx-swap="outerHTML"
       class="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-center text-xs font-medium text-slate-500">
@@ -544,7 +544,7 @@
 <div id="arrival-load-more" hx-swap-oob="outerHTML">
   {{if .HasMore}}
   <div
-    hx-get='{{b "/arrival/list"}}?date={{.Date}}&search={{.Search}}&paket={{.Paket}}&dept={{.Department}}&page={{.NextPage}}'
+    hx-get='{{b "/arrival/list"}}?date={{urlquery .Date}}&search={{urlquery .Search}}&paket={{urlquery .Paket}}&dept={{urlquery .Department}}&page={{.NextPage}}'
     hx-trigger="revealed"
     hx-swap="outerHTML"
     class="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-center text-xs font-medium text-slate-500">
diff --git a/cpone-dashboard/templates/progress/index.html b/cpone-dashboard/templates/progress/index.html
index 7a202fe..f1dd496 100644
--- a/cpone-dashboard/templates/progress/index.html
+++ b/cpone-dashboard/templates/progress/index.html
@@ -192,7 +192,7 @@
   <div id="progress-load-more" class="px-4 pb-4">
     {{if .HasMore}}
     <div
-      hx-get='{{b "/progress/list"}}?search={{.Search}}&status={{.Status}}&packet={{.Packet}}&page={{.NextPage}}'
+      hx-get='{{b "/progress/list"}}?search={{urlquery .Search}}&status={{urlquery .Status}}&packet={{urlquery .Packet}}&page={{.NextPage}}'
       hx-trigger="revealed"
       hx-swap="outerHTML"
       class="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-center text-xs font-medium text-slate-500">
@@ -286,7 +286,7 @@
 <div id="progress-load-more" hx-swap-oob="outerHTML">
   {{if .HasMore}}
   <div
-    hx-get='{{b "/progress/list"}}?search={{.Search}}&status={{.Status}}&packet={{.Packet}}&page={{.NextPage}}'
+    hx-get='{{b "/progress/list"}}?search={{urlquery .Search}}&status={{urlquery .Status}}&packet={{urlquery .Packet}}&page={{.NextPage}}'
     hx-trigger="revealed"
     hx-swap="outerHTML"
     class="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-center text-xs font-medium text-slate-500">
diff --git a/cpone-dashboard/templates/result/index.html b/cpone-dashboard/templates/result/index.html
index ee5af78..19c3edc 100644
--- a/cpone-dashboard/templates/result/index.html
+++ b/cpone-dashboard/templates/result/index.html
@@ -148,7 +148,7 @@
   <div id="result-load-more" class="px-4 pb-4">
     {{if .HasMore}}
     <div
-      hx-get='{{b "/result/list"}}?search={{.Search}}&filter={{.Filter}}&packet={{.Packet}}&page={{.NextPage}}'
+      hx-get='{{b "/result/list"}}?search={{urlquery .Search}}&filter={{urlquery .Filter}}&packet={{urlquery .Packet}}&page={{.NextPage}}'
       hx-trigger="revealed"
       hx-swap="outerHTML"
       class="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-center text-xs font-medium text-slate-500">
@@ -278,7 +278,7 @@ document.addEventListener('keydown', function(e) {
 <div id="result-load-more" hx-swap-oob="outerHTML">
   {{if .HasMore}}
   <div
-    hx-get='{{b "/result/list"}}?search={{.Search}}&filter={{.Filter}}&packet={{.Packet}}&page={{.NextPage}}'
+    hx-get='{{b "/result/list"}}?search={{urlquery .Search}}&filter={{urlquery .Filter}}&packet={{urlquery .Packet}}&page={{.NextPage}}'
     hx-trigger="revealed"
     hx-swap="outerHTML"
     class="rounded-lg border border-slate-200 bg-slate-50 px-3 py-2 text-center text-xs font-medium text-slate-500">