diff --git a/inc/Action/Search.php b/inc/Action/Search.php
index 7f632727bebee64699dc3e213a6bd661565a18a6..4f07cd9552663e6454da06af7b3f64c26d49df38 100644
--- a/inc/Action/Search.php
+++ b/inc/Action/Search.php
@@ -65,7 +65,7 @@ class Search extends AbstractAction {
     {
         global $INPUT, $QUERY;
         $this->pageLookupResults = ft_pageLookup($QUERY, true, useHeading('navigation'));
-        $this->fullTextResults = ft_pageSearch($QUERY, $highlight, $INPUT->str('sort'));
+        $this->fullTextResults = ft_pageSearch($QUERY, $highlight, $INPUT->str('srt'));
         $this->highlight = $highlight;
     }
 
@@ -78,7 +78,7 @@ class Search extends AbstractAction {
     {
         global $conf, $INPUT, $QUERY, $ID;
 
-        if ($INPUT->bool('searchPageForm')) {
+        if ($INPUT->bool('sf')) {
             return;
         }
 
diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php
index 8bb1913e32c70d833701501251a23bfbedeccbbb..57e71e8ead749e9ce1bafcf5e0067ab8610d4439 100644
--- a/inc/Ui/Search.php
+++ b/inc/Ui/Search.php
@@ -68,15 +68,15 @@ class Search extends Ui
         $searchForm = (new Form())->attrs(['method' => 'get'])->addClass('search-results-form');
         $searchForm->setHiddenField('do', 'search');
         $searchForm->setHiddenField('id', $ID);
-        $searchForm->setHiddenField('searchPageForm', '1');
-        if ($INPUT->has('after')) {
-            $searchForm->setHiddenField('after', $INPUT->str('after'));
+        $searchForm->setHiddenField('sf', '1');
+        if ($INPUT->has('dta')) {
+            $searchForm->setHiddenField('dta', $INPUT->str('dta'));
         }
-        if ($INPUT->has('before')) {
-            $searchForm->setHiddenField('before', $INPUT->str('before'));
+        if ($INPUT->has('dtb')) {
+            $searchForm->setHiddenField('dtb', $INPUT->str('dtb'));
         }
-        if ($INPUT->has('sort')) {
-            $searchForm->setHiddenField('sort', $INPUT->str('sort'));
+        if ($INPUT->has('srt')) {
+            $searchForm->setHiddenField('srt', $INPUT->str('srt'));
         }
         $searchForm->addFieldsetOpen()->addClass('search-results-form__fieldset');
         $searchForm->addTextInput('q')->val($query)->useInput(false);
@@ -107,7 +107,7 @@ class Search extends Ui
         ];
         $activeOption = 'hits';
 
-        if ($INPUT->str('sort') === 'mtime') {
+        if ($INPUT->str('srt') === 'mtime') {
             $activeOption = 'mtime';
         }
 
@@ -410,7 +410,7 @@ class Search extends Ui
         ];
         $activeOption = 'any';
         foreach ($options as $key => $option) {
-            if ($INPUT->str('after') === $option['after']) {
+            if ($INPUT->str('dta') === $option['after']) {
                 $activeOption = $key;
                 break;
             }
@@ -419,7 +419,7 @@ class Search extends Ui
         $searchForm->addTagOpen('div')->addClass('search-tool js-search-tool');
         // render current
         $currentWrapper = $searchForm->addTagOpen('div')->addClass('search-tool__current js-current');
-        if ($INPUT->has('before') || $INPUT->has('after')) {
+        if ($INPUT->has('dtb') || $INPUT->has('dta')) {
             $currentWrapper->addClass('search-tool__current--changed');
         }
         $searchForm->addHTML($options[$activeOption]['label']);
diff --git a/inc/Ui/SearchState.php b/inc/Ui/SearchState.php
index 9e92687879dea8d6fe3b96b26e16388b7a0a2172..65a4ce83265d5eaef6bf1acb2c8d2ffa1bf20787 100644
--- a/inc/Ui/SearchState.php
+++ b/inc/Ui/SearchState.php
@@ -16,9 +16,9 @@ class SearchState
         global $INPUT;
 
         $this->parsedQuery = $parsedQuery;
-        $this->parsedQuery['after'] = $INPUT->str('after');
-        $this->parsedQuery['before'] = $INPUT->str('before');
-        $this->parsedQuery['sort'] = $INPUT->str('sort');
+        $this->parsedQuery['after'] = $INPUT->str('dta');
+        $this->parsedQuery['before'] = $INPUT->str('dtb');
+        $this->parsedQuery['sort'] = $INPUT->str('srt');
     }
 
     /**
@@ -98,15 +98,15 @@ class SearchState
             $parsedQuery['ns'],
             $parsedQuery['notns']
         );
-        $hrefAttributes = ['do' => 'search', 'searchPageForm' => '1', 'q' => $newQuery];
+        $hrefAttributes = ['do' => 'search', 'sf' => '1', 'q' => $newQuery];
         if ($parsedQuery['after']) {
-            $hrefAttributes['after'] = $parsedQuery['after'];
+            $hrefAttributes['dta'] = $parsedQuery['after'];
         }
         if ($parsedQuery['before']) {
-            $hrefAttributes['before'] = $parsedQuery['before'];
+            $hrefAttributes['dtb'] = $parsedQuery['before'];
         }
         if ($parsedQuery['sort']) {
-            $hrefAttributes['sort'] = $parsedQuery['sort'];
+            $hrefAttributes['srt'] = $parsedQuery['sort'];
         }
         $searchForm->addTagOpen('a')
             ->attrs([