Update

Author: joepdooper

src/Shared/Traits/HasPagination.php

@@ -22,7 +22,7 @@ public static function setPagination(PaginationResult $pagination): void
         static::$pagination = $pagination;
     }
 
-    public function scopePaged(
+    public function scopePages(
         Builder $query,
         Request $request,
     ): Builder {

src/Template/Presentation/View/Engine/LatteEngine.php

@@ -183,12 +183,28 @@ private function registerFunctions(): void
 
         $this->latte->addFunction(
             'queryUrl',
-            fn(array $replace = [], array $remove = [])
-            => $this->queryBuilder->build(
-                $this->request->query->all(),
-                $replace,
-                $remove
-            )
+            function (array $params = []) {
+
+                $query = $this->request->query->all();
+
+                foreach ($query as $key => $value) {
+                    if (is_array($value)) {
+                        $query[$key] = end($value);
+                    }
+                }
+
+                foreach ($params as $key => $value) {
+
+                    if (is_int($key)) {
+                        unset($query[$value]);
+                        continue;
+                    }
+
+                    $query[$key] = $value;
+                }
+
+                return $query ? '?' . http_build_query($query) : '';
+            }
         );
     }