diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue
index cb78309e..9e7270aa 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue
@@ -107,6 +107,10 @@
                 if (this.from && this.to) {
                     this.picker.setDate([ new Date(this.from), new Date(this.to) ]);
                 }
+                if (this.minDate && this.maxDate) {
+                    this.picker.set('minDate', new Date(this.minDate));
+                    this.picker.set('maxDate', new Date(this.maxDate));
+                }
             });
             EventBus.$on('filterSettingsReset', () => {
                 this.reset();
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
index a58c2663..80fa60a8 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
@@ -1,7 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
-      xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
-      xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers">
+      xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">
 
     <f:layout name="Default"/>
 
@@ -11,9 +10,9 @@
                 options-uri='<ep:uri.ajax controller="AjaxSearchbar" action="options" pageUid="{settings.defaultAjaxUid}" />'
                 reset-uri='<ep:uri.ajax controller="AjaxSearchbar" action="reset" pageUid="{settings.defaultAjaxUid}" />'
                 argument-prefix='<ep:argumentPrefix pluginName="ajax" />'
-                :initial-search-params='<v:format.json.encode>{searchParams}</v:format.json.encode>'
-                :initial-filter-options='<v:format.json.encode>{filterOptions}</v:format.json.encode>'
-                :date-presets='{settings.datePickerPresets -> v:format.json.encode()}'
+                :initial-search-params='{searchParams -> f:format.json() -> f:format.raw()}'
+                :initial-filter-options='{filterOptions -> f:format.json() -> f:format.raw()}'
+                :date-presets='{settings.datePickerPresets -> f:format.json() -> f:format.raw()}'
                 inline-template>
                 <div class="container searchbar affix{f:if(condition: fixed, else: '-top')}"{f:if(condition: fixed, else: ' data-spy="affix" data-offset-top="650" data-offset-bottom="200"')}>
                     <div class="container">
diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
index fdae422f..c953da19 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
@@ -1,7 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
       xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
-      xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers"
-      xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers">
+      xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">
 
     <f:layout name="Default"/>
 
@@ -11,9 +10,9 @@
                 options-uri='<ep:uri.ajax controller="AjaxSearchbar" action="options" pageUid="{settings.defaultAjaxUid}" />'
                 reset-uri='<ep:uri.ajax controller="AjaxSearchbar" action="reset" pageUid="{settings.defaultAjaxUid}" />'
                 argument-prefix='<ep:argumentPrefix pluginName="ajax" />'
-                :initial-search-params='<v:format.json.encode>{searchParams}</v:format.json.encode>'
-                :initial-filter-options='<v:format.json.encode>{filterOptions}</v:format.json.encode>'
-                :date-presets='{settings.datePickerPresets -> v:format.json.encode()}'
+                :initial-search-params='{searchParams -> f:format.json() -> f:format.raw()}'
+                :initial-filter-options='{filterOptions -> f:format.json() -> f:format.raw()}'
+                :date-presets='{settings.datePickerPresets -> f:format.json() -> f:format.raw()}'
                 inline-template>
                 <div class="container">
                     <f:form action="processSearch" controller="Search" method="post" name="searchParams"
