diff --git a/searx/static/plugins/js/infinite_scroll.js b/searx/static/plugins/js/infinite_scroll.js
index db84a6908..9930880e3 100644
--- a/searx/static/plugins/js/infinite_scroll.js
+++ b/searx/static/plugins/js/infinite_scroll.js
@@ -1,24 +1,40 @@
+function hasScrollbar() {
+    var root = document.compatMode=='BackCompat'? document.body : document.documentElement;
+    return root.scrollHeight>root.clientHeight;
+}
+
+function loadNextPage() {
+    var formData = $('#pagination form:last').serialize();
+    if (formData) {
+        $('#pagination').html('<div class="loading-spinner"></div>');
+        $.ajax({
+            type: "POST",
+            url: './',
+            data: formData,
+            dataType: 'html',
+            success: function(data) {
+                var body = $(data);
+                $('#pagination').remove();
+                $('#main_results').append('<hr/>');
+                $('#main_results').append(body.find('.result'));
+                $('#main_results').append(body.find('#pagination'));
+                if(!hasScrollbar()) {
+                    loadNextPage();
+                }
+            }
+        });
+    }
+}
+
 $(document).ready(function() {
     var win = $(window);
+    if(!hasScrollbar()) {
+        loadNextPage();
+    }
     win.scroll(function() {
+        $("#pagination button").css("visibility", "hidden");
         if ($(document).height() - win.height() - win.scrollTop() < 150) {
-            var formData = $('#pagination form:last').serialize();
-            if (formData) {
-                $('#pagination').html('<div class="loading-spinner"></div>');
-                $.ajax({
-                    type: "POST",
-                    url: './',
-                    data: formData,
-                    dataType: 'html',
-                    success: function(data) {
-                        var body = $(data);
-                        $('#pagination').remove();
-                        $('#main_results').append('<hr/>');
-                        $('#main_results').append(body.find('.result'));
-                        $('#main_results').append(body.find('#pagination'));
-                    }
-                });
-            }
+            loadNextPage();
         }
     });
 });
diff --git a/searx/static/themes/oscar/js/searx.js b/searx/static/themes/oscar/js/searx.js
index 927aeb422..9138576f5 100644
--- a/searx/static/themes/oscar/js/searx.js
+++ b/searx/static/themes/oscar/js/searx.js
@@ -86,6 +86,9 @@ $(document).ready(function(){
             },
             source: searx.searchResults.ttAdapter()
         });
+        $('#q').bind('typeahead:selected', function(ev, suggestion) {
+            $("#search_form").submit();
+        });
     }
 });
 ;/**
diff --git a/searx/static/themes/oscar/js/searx.min.js b/searx/static/themes/oscar/js/searx.min.js
index 354d9f2fe..4c01dca94 100644
Binary files a/searx/static/themes/oscar/js/searx.min.js and b/searx/static/themes/oscar/js/searx.min.js differ
diff --git a/searx/static/themes/oscar/js/searx_src/autocompleter.js b/searx/static/themes/oscar/js/searx_src/autocompleter.js
index 0907f8e34..985be2c7c 100644
--- a/searx/static/themes/oscar/js/searx_src/autocompleter.js
+++ b/searx/static/themes/oscar/js/searx_src/autocompleter.js
@@ -33,5 +33,8 @@ $(document).ready(function(){
             },
             source: searx.searchResults.ttAdapter()
         });
+        $('#q').bind('typeahead:selected', function(ev, suggestion) {
+            $("#search_form").submit();
+        });
     }
 });
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
index cad9eca89..9978801ca 100644
--- a/searx/templates/oscar/search.html
+++ b/searx/templates/oscar/search.html
@@ -6,6 +6,7 @@
         <input type="search" name="q" class="form-control" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
+            <button type="reset" class="btn btn-default" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
         </span>
       </div>
     </div>
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
index 656463178..ea821dc45 100644
--- a/searx/templates/oscar/search_full.html
+++ b/searx/templates/oscar/search_full.html
@@ -9,6 +9,7 @@
         <input type="search" name="q" class="form-control input-lg autofocus" id="q" placeholder="{{ _('Search for...') }}" aria-label="{{ _('Search for...') }}" autocomplete="off" value="{{ q }}" accesskey="s">
         <span class="input-group-btn">
             <button type="submit" class="btn btn-default input-lg" aria-label="{{ _('Start search') }}"><span class="hide_if_nojs">{{ icon('search') }}</span><span class="hidden active_if_nojs">{{ _('Start search') }}</span></button>
+            <button type="reset" class="btn btn-default input-lg" aria-label="{{ _('Clear search') }}"><span class="hide_if_nojs">{{ icon('remove') }}</span><span class="hidden active_if_nojs">{{ _('Clear') }}</span></button>
         </span>
     </div>
     <div class="col-md-8 col-md-offset-2  advanced">