diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript
index c4fb5ec..0a73f24 100644
--- a/Configuration/TypoScript/setup.typoscript
+++ b/Configuration/TypoScript/setup.typoscript
@@ -27,7 +27,7 @@ plugin.tx_events {
         # if set to 1, the enable fields are ignored in BE context
         ignoreAllEnableFieldsInBe = 0
         # Should be on by default, but can be disabled if all action in the plugin are uncached
-        requireCHashArgumentForActionArguments = 1
+        requireCHashArgumentForActionArguments = 0
     }
     mvc {
         #callDefaultActionIfActionCantBeResolved = 1
diff --git a/Resources/Private/Partials/Date/SearchForm.html b/Resources/Private/Partials/Date/SearchForm.html
index 541cdec..7ae14e9 100644
--- a/Resources/Private/Partials/Date/SearchForm.html
+++ b/Resources/Private/Partials/Date/SearchForm.html
@@ -3,7 +3,7 @@
     <div class="col-8 mb-5">
         <!-- TODO bg color classes not loaded in scss -->
 
-            <f:form action="search" additionalAttributes="{role: 'form'}" method="get" addQueryString="1">
+            <f:form action="search" controller="Date" additionalAttributes="{role: 'form'}" method="get">
 
                 <div class="row">
                     <div class="col">
diff --git a/Resources/Private/Partials/Event/SearchForm.html b/Resources/Private/Partials/Event/SearchForm.html
index 79beea0..34f9236 100644
--- a/Resources/Private/Partials/Event/SearchForm.html
+++ b/Resources/Private/Partials/Event/SearchForm.html
@@ -3,7 +3,7 @@
 <div class="row">
     <div class="col-12">
         <div class="p-3 mb-2 bg-light text-dark">
-            <f:form action="search" additionalAttributes="{role: 'form'}" method="get" addQueryString="1">
+            <f:form action="search" controller="Event" additionalAttributes="{role: 'form'}" method="get">
                 <div class="input-group mb-3">
                     <f:form.textfield name="search" value="{search}" class="form-control" />
                     <f:form.submit value="Search" class="btn btn-outline-secondary" />