diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index ea9a4737c..549025dec 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -912,7 +912,7 @@ class HTML
 			'$save_label'   => $save_label,
 			'$search_hint'  => L10n::t('@name, !forum, #tags, content'),
 			'$mode'         => $mode,
-			'$return_url'   => urlencode('search?q=' . $s),
+			'$return_url'   => urlencode('search?q=' . urlencode($s)),
 		];
 
 		if (!$aside) {
diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 9c0d9e1df..73de090a7 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -63,7 +63,7 @@ class Index extends BaseSearchModule
 		}
 
 		if (local_user()) {
-			self::getApp()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . $search, $search);
+			self::getApp()->page['aside'] .= Widget\SavedSearches::getHTML('search?q=' . urlencode($search), $search);
 		}
 
 		Nav::setSelected('search');
diff --git a/src/Module/Search/Saved.php b/src/Module/Search/Saved.php
index 772f4782c..9d8d84b55 100644
--- a/src/Module/Search/Saved.php
+++ b/src/Module/Search/Saved.php
@@ -10,17 +10,17 @@ use Friendica\Util\Strings;
 
 class Saved extends BaseModule
 {
-	public static function rawContent()
+	public static function init()
 	{
 		/** @var Arguments $args */
 		$args = self::getClass(Arguments::class);
 
 		$action = $args->get(2, 'none');
-		$search = Strings::escapeTags(trim(rawurldecode($args->get(3, ''))));
+		$search = Strings::escapeTags(trim(rawurldecode($_GET['term'] ?? '')));
 
 		$return_url = $_GET['return_url'] ?? 'search?q=' . urlencode($search);
 
-		if (local_user()) {
+		if (local_user() && $search) {
 			switch ($action) {
 				case 'add':
 					$fields = ['uid' => local_user(), 'term' => $search];
diff --git a/static/routes.config.php b/static/routes.config.php
index 841fd68f9..c52b5d802 100644
--- a/static/routes.config.php
+++ b/static/routes.config.php
@@ -191,8 +191,8 @@ return [
 	'/search' => [
 		'[/]'                  => [Module\Search\Index::class, [R::GET]],
 		'/acl'                 => [Module\Search\Acl::class,   [R::GET, R::POST]],
-		'/saved/add/{term}'    => [Module\Search\Saved::class, [R::GET]],
-		'/saved/remove/{term}' => [Module\Search\Saved::class, [R::GET]],
+		'/saved/add'           => [Module\Search\Saved::class, [R::GET]],
+		'/saved/remove'        => [Module\Search\Saved::class, [R::GET]],
 	],
 
 	'/settings' => [
diff --git a/view/templates/searchbox.tpl b/view/templates/searchbox.tpl
index d566befba..8317c59b1 100644
--- a/view/templates/searchbox.tpl
+++ b/view/templates/searchbox.tpl
@@ -11,7 +11,7 @@
     {{/if}}
 		<input type="submit" name="submit" id="search-submit" value="{{$search_label}}"/>
     {{if $s}}
-	    <a href="search/saved/add/{{$q}}?return_url={{$return_url}}">{{$save_label}}</a>
+	    <a href="search/saved/add?term={{$q}}&amp;return_url={{$return_url}}">{{$save_label}}</a>
     {{/if}}
 {{/strip}}
 	</form>
diff --git a/view/templates/widget/saved_searches.tpl b/view/templates/widget/saved_searches.tpl
index 858e921f7..4e3a80b76 100644
--- a/view/templates/widget/saved_searches.tpl
+++ b/view/templates/widget/saved_searches.tpl
@@ -6,7 +6,7 @@
 	<ul role="menu" id="saved-search-ul">
 		{{foreach $saved as $search}}
 		<li role="menuitem" class="saved-search-li clear">
-			<a href="search/saved/remove/{{$search.encodedterm}}?return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop"></a>
+			<a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop"></a>
 			<a href="search?q={{$search.encodedterm}}" id="saved-search-term-{{$search.id}}" class="savedsearchterm">{{$search.term}}</a>
 		</li>
 		{{/foreach}}
diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index 2cfc63d36..9f487742e 100644
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -2312,7 +2312,7 @@ ul.dropdown-menu li:hover {
 .search-content-wrapper > .section-title-wrapper {
     display: none;
 }
-#navbar-button > #search-save-form > #search-save {
+#navbar-button > #search-save {
     margin-top: 3px;
 }
 /* Section-Content-Wrapper */
diff --git a/view/theme/frio/js/theme.js b/view/theme/frio/js/theme.js
index 2ab11e637..46cea59ba 100644
--- a/view/theme/frio/js/theme.js
+++ b/view/theme/frio/js/theme.js
@@ -169,7 +169,7 @@ $(document).ready(function(){
 	}
 
 	// move the "Save the search" button to the second navbar
-	$(".search-content-wrapper #search-save-form ").appendTo("#topbar-second > .container > #navbar-button");
+	$(".search-content-wrapper #search-save").appendTo("#topbar-second > .container > #navbar-button");
 
 	// append the vcard-short-info to the second nav after passing the element
 	// with .fn (vcard username). Use scrollspy to get the scroll position.
diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index 4698fb657..bbbaaedc9 100644
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -109,7 +109,7 @@
 							<form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
 								<!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
 								<div class="form-group form-group-search">
-									<input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
+									<input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="q" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
 									<button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
 								</div>
 							</form>
diff --git a/view/theme/frio/templates/searchbox.tpl b/view/theme/frio/templates/searchbox.tpl
index bf2ee5304..ced6fbbd3 100644
--- a/view/theme/frio/templates/searchbox.tpl
+++ b/view/theme/frio/templates/searchbox.tpl
@@ -18,7 +18,7 @@ Some parts of this template will be moved by js to other places (see theme.js) -
 					<div class="col-md-8">
 						{{* The button to save searches *}}
 						{{if $s}}
-						<a href="search/saved/add/{{$q}}?return_url={{$return_url}}" class="btn btn-primary btn-small pull-right">{{$save_label}}</a>
+						<a href="search/saved/add?term={{$q}}&amp;return_url={{$return_url}}" class="btn btn-primary btn-small pull-right">{{$save_label}}</a>
 						{{/if}}
 
 						{{* The select popup menu to select what kind of results the user would like to search for *}}
@@ -46,16 +46,13 @@ Some parts of this template will be moved by js to other places (see theme.js) -
 	</div>
 
 {{if $s}}
-	<form id="search-save-form" action="search/saved/add/{{$q}}" method="get">
-		<input type="hidden" name="return_url" value="{{$return_url}}">
-		<button class="btn btn-sm btn-main pull-right" type="submit" id="search-save" title="{{$save_label}}" aria-label="{{$save_label}}" value="{{$save_label}}" data-toggle="tooltip">
+	<a href="search/saved/add?term={{$q}}&amp;return_url={{$return_url}}" class="btn btn-sm btn-main pull-right" id="search-save" title="{{$save_label}}" aria-label="{{$save_label}}" value="{{$save_label}}" data-toggle="tooltip">
 	{{if $mode == "tag"}}
-			<i class="fa fa-plus fa-2x" aria-hidden="true"></i>
+		<i class="fa fa-plus fa-2x" aria-hidden="true"></i>
 	{{else}}
-			<i class="fa fa-floppy-o fa-2x" aria-hidden="true"></i>
+		<i class="fa fa-floppy-o fa-2x" aria-hidden="true"></i>
 	{{/if}}
-			<span class="sr-only">{{$save_label}}</span>
-		</button>
-	</form>
+		<span class="sr-only">{{$save_label}}</span>
+	</a>
 {{/if}}
 </div>
diff --git a/view/theme/frio/templates/widget/saved_searches.tpl b/view/theme/frio/templates/widget/saved_searches.tpl
index 1553961e1..1981508cf 100644
--- a/view/theme/frio/templates/widget/saved_searches.tpl
+++ b/view/theme/frio/templates/widget/saved_searches.tpl
@@ -6,7 +6,7 @@
 	<ul role="menu" id="saved-search-ul">
 		{{foreach $saved as $search}}
 		<li role="menuitem" class="saved-search-li clear">
-			<a href="search/saved/remove/{{$search.encodedterm}}?return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon">
+			<a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon">
 				<i class="fa fa-trash" aria-hidden="true"></i>
 			</a>
 			<a href="search?q={{$search.encodedterm}}" id="saved-search-term-{{$search.id}}" class="savedsearchterm">{{$search.term}}</a>
diff --git a/view/theme/quattro/templates/widget/saved_searches.tpl b/view/theme/quattro/templates/widget/saved_searches.tpl
index 69e21c786..ce99d521d 100644
--- a/view/theme/quattro/templates/widget/saved_searches.tpl
+++ b/view/theme/quattro/templates/widget/saved_searches.tpl
@@ -5,7 +5,7 @@
         {{foreach $saved as $search}}
 			<li class="tool {{if $search.selected}}selected{{/if}}">
 				<a href="search?q={{$search.encodedterm}}" class="label">{{$search.term}}</a>
-				<a href="search/saved/remove/{{$search.encodedterm}}?return_url={{$return_url}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
+				<a href="search/saved/remove?term={{$search.encodedterm}}&amp;return_url={{$return_url}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
 			</li>
         {{/foreach}}
 	</ul>