diff --git a/doku.php b/doku.php
index d02a4320019d492e5a319fa93f2bd35276bc47e1..eb7b7d472e105c7eb30a054e34bf280c05a83648 100644
--- a/doku.php
+++ b/doku.php
@@ -35,7 +35,7 @@ require_once(DOKU_INC.'inc/init.php');
 
 //import variables
 $INPUT->set('id', str_replace("\xC2\xAD", '', $INPUT->str('id'))); //soft-hyphen
-$QUERY          = trim($INPUT->str('id'));
+$QUERY          = trim($INPUT->str('q'));
 $ID             = getID();
 
 $REV   = $INPUT->int('rev');
diff --git a/inc/Action/Search.php b/inc/Action/Search.php
index f848d87524354dfdc6f312c65ec6701bb6398de1..4cc3017facee6ead06ec8f19015a9c5d120ce205 100644
--- a/inc/Action/Search.php
+++ b/inc/Action/Search.php
@@ -25,13 +25,22 @@ class Search extends AbstractAction {
      */
     public function checkPermissions() {
         parent::checkPermissions();
-        global $QUERY;
-        $s = cleanID($QUERY);
-        if($s === '') throw new ActionAbort();
     }
 
     public function preProcess()
     {
+        global $QUERY, $ID, $conf, $INPUT;
+        $s = cleanID($QUERY);
+
+        if ($ID !== $conf['start'] && $s === '') {
+            parse_str($INPUT->server->str('QUERY_STRING'), $urlParts);
+            $urlParts['q'] = $urlParts['id'];
+            $urlParts['id'] = $conf['start'];
+            $url = DOKU_URL . DOKU_SCRIPT . '?' . http_build_query($urlParts, null, '&');
+            send_redirect($url);
+        }
+
+        if ($s === '') throw new ActionAbort();
         $this->adjustGlobalQuery();
     }
 
diff --git a/inc/Ui/Search.php b/inc/Ui/Search.php
index 2d7ae6b3bcabfca349c30a541489a16b034ea7dd..b568a632fc1b1b646f84c77fc9a0ffe918ccebe3 100644
--- a/inc/Ui/Search.php
+++ b/inc/Ui/Search.php
@@ -91,7 +91,7 @@ class Search extends Ui
 
         $searchForm = (new Form())->attrs(['method' => 'get'])->addClass('search-results-form');
         $searchForm->setHiddenField('do', 'search');
-        $searchForm->setHiddenField('from', $ID);
+        $searchForm->setHiddenField('id', $ID);
         $searchForm->setHiddenField('searchPageForm', '1');
         if ($INPUT->has('after')) {
             $searchForm->setHiddenField('after', $INPUT->str('after'));
@@ -100,7 +100,7 @@ class Search extends Ui
             $searchForm->setHiddenField('before', $INPUT->str('before'));
         }
         $searchForm->addFieldsetOpen()->addClass('search-results-form__fieldset');
-        $searchForm->addTextInput('id')->val($query)->useInput(false);
+        $searchForm->addTextInput('q')->val($query)->useInput(false);
         $searchForm->addButton('', $lang['btn_search'])->attr('type', 'submit');
 
         if ($this->isSearchAssistanceAvailable($this->parsedQuery)) {
@@ -222,7 +222,7 @@ class Search extends Ui
         $after = null,
         $before = null
     ) {
-        global $INPUT;
+        global $INPUT, $ID;
         if (null === $and) {
             $and = $this->parsedQuery['and'];
         }
@@ -252,7 +252,7 @@ class Search extends Ui
             $ns,
             $notns
         );
-        $hrefAttributes = ['do' => 'search', 'searchPageForm' => '1'];
+        $hrefAttributes = ['do' => 'search', 'searchPageForm' => '1', 'q' => $newQuery];
         if ($after) {
             $hrefAttributes['after'] = $after;
         }
@@ -261,7 +261,7 @@ class Search extends Ui
         }
         $searchForm->addTagOpen('a')
             ->attrs([
-                'href' => wl($newQuery, $hrefAttributes, false, '&')
+                'href' => wl($ID, $hrefAttributes, false, '&')
             ])
         ;
         $searchForm->addHTML($label);
diff --git a/inc/template.php b/inc/template.php
index 20b0831a973f2f23c52bbb2c78be76c88428cb3e..9a5f611b53affd6b880c8e8c59708335f1e2ff40 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -670,8 +670,8 @@ function tpl_searchform($ajax = true, $autocomplete = true) {
     ]);
     $searchForm->addTagOpen('div')->addClass('no');
     $searchForm->setHiddenField('do', 'search');
-    $searchForm->setHiddenField('from', $ID);
-    $searchForm->addTextInput('id')
+    $searchForm->setHiddenField('id', $ID);
+    $searchForm->addTextInput('q')
         ->addClass('edit')
         ->attrs([
             'title' => '[F]',