Merging master branch

- fix title sort function
- fix focus on search

cps/db.py

@@ -449,7 +449,7 @@ class CalibreDB(threading.Thread):
             match = title_pat.search(title)
             if match:
                 prep = match.group(1)
-                title = title.replace(prep, '') + ', ' + prep
+                title = title[len(prep):] + ', ' + prep
             return title.strip()
 
         conn = conn or self.session.connection().connection.connection

cps/templates/layout.html

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