diff --git a/rhodecode/apps/home/tests/__init__.py b/rhodecode/apps/home/tests/__init__.py
--- a/rhodecode/apps/home/tests/__init__.py
+++ b/rhodecode/apps/home/tests/__init__.py
@@ -31,7 +31,8 @@ def assert_and_get_main_filter_content(r
         assert data_item['url']
 
         if data_item['type'] == 'search':
-            assert data_item['value_display'].startswith('Full text search for:')
+            display_val = data_item['value_display']
+            assert 'Search for:' in display_val, display_val
         elif data_item['type'] == 'repo':
             repos.append(data_item)
         elif data_item['type'] == 'repo_group':
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -594,7 +594,7 @@ commit:efced4, to search for commits
 
         $('#main_filter').autocomplete({
             serviceUrl: pyroutes.url('goto_switcher_data'),
-            params: {"repo_group_id": templateContext.repo_group_id},
+            params: {"search_context": templateContext.search_context},
             minChars:2,
             maxHeight:400,
             deferRequestBy: 300, //miliseconds
@@ -602,9 +602,15 @@ commit:efced4, to search for commits
             autoSelectFirst: true,
             formatResult: autocompleteMainFilterFormatResult,
             lookupFilter: autocompleteMainFilterResult,
-            onSelect: function(element, suggestion){
+            onSelect: function (element, suggestion) {
                 handleSelect(element, suggestion);
                 return false;
+            },
+            onSearchError: function (element, query, jqXHR, textStatus, errorThrown) {
+                if (jqXHR !== 'abort') {
+                    alert("Error during search.\nError code: {0}".format(textStatus));
+                    window.location = '';
+                }
             }
         });