From a38554232b3bc5013b3452cc7ac77d693d1ba2bc Mon Sep 17 00:00:00 2001
From: bancer <val@dinnerbooking.com>
Date: Wed, 1 Nov 2023 10:04:05 +0100
Subject: [PATCH 1/2] Add support of request query string without "data" string
 present

---
 src/Controller/Component/FilterComponent.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Controller/Component/FilterComponent.php b/src/Controller/Component/FilterComponent.php
index e1997d9..0065e75 100644
--- a/src/Controller/Component/FilterComponent.php
+++ b/src/Controller/Component/FilterComponent.php
@@ -122,6 +122,9 @@ public function startup(Event $event)
         if ($controller->request->is('get') && !empty($filterFormId)) {
             /** @var array<mixed> $requestData */
             $requestData = $controller->request->getQuery('data', []);
+            if (empty($requestData)) {
+            	$requestData = $controller->request->getQuery();
+            }
             $this->formData = $requestData;
         } elseif (
             !$controller->request->is('post') ||

From ffd35d199f65c8a585ca144ad5983864d234864f Mon Sep 17 00:00:00 2001
From: bancer <val@dinnerbooking.com>
Date: Wed, 1 Nov 2023 10:07:30 +0100
Subject: [PATCH 2/2] Fix code style error

---
 src/Controller/Component/FilterComponent.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Controller/Component/FilterComponent.php b/src/Controller/Component/FilterComponent.php
index 0065e75..3dc567d 100644
--- a/src/Controller/Component/FilterComponent.php
+++ b/src/Controller/Component/FilterComponent.php
@@ -123,7 +123,7 @@ public function startup(Event $event)
             /** @var array<mixed> $requestData */
             $requestData = $controller->request->getQuery('data', []);
             if (empty($requestData)) {
-            	$requestData = $controller->request->getQuery();
+                $requestData = $controller->request->getQueryParams();
             }
             $this->formData = $requestData;
         } elseif (