Merge remote-tracking branch 'search_focus/activate-search-focus-if-search-in-progress'

cps/templates/layout.html

@@ -227,7 +227,9 @@
             $(document).ready(function() {
               var inp = $('#query').first()
               var val = inp.val()
-              inp.val('').blur().focus().val(val)
+              if (val.length) {
+                  inp.val('').blur().focus().val(val)
+              }
             });
         });
     </script>