diff --git a/cps/admin.py b/cps/admin.py
index 32d66a6f..98535320 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -41,7 +41,6 @@ from sqlalchemy.exc import IntegrityError, OperationalError, InvalidRequestError
 from sqlalchemy.sql.expression import func, or_, text
 
 from . import constants, logger, helper, services, isoLanguages, fs
-from .cli import filepicker
 from . import db, calibre_db, ub, web_server, get_locale, config, updater_thread, babel, gdriveutils
 from .helper import check_valid_domain, send_test_mail, reset_password, generate_password_hash, check_email, \
     valid_email, check_username
diff --git a/cps/templates/book_cover.html b/cps/templates/book_cover.html
index c5281797..67e7c24b 100644
--- a/cps/templates/book_cover.html
+++ b/cps/templates/book_cover.html
@@ -1,5 +1,6 @@
-{% macro book_cover_image(book, thumbnails) -%}
+{% macro book_cover_image(book, thumbnails, title) -%}
     {%- set book_title = book.title if book.title else book.name -%}
+    {%- set book_title = title if title else book_title -%}
     {% set srcset = thumbnails|get_book_thumbnail_srcset if thumbnails|length else '' %}
     {%- if srcset|length -%}
         <img
diff --git a/cps/updater.py b/cps/updater.py
index 63ea23bf..8c6c9f7c 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -265,7 +265,7 @@ class Updater(threading.Thread):
             os.sep + 'gdrive_credentials', os.sep + 'settings.yaml', os.sep + 'venv', os.sep + 'virtualenv',
             os.sep + 'access.log', os.sep + 'access.log1', os.sep + 'access.log2',
             os.sep + '.calibre-web.log.swp', os.sep + '_sqlite3.so', os.sep + 'cps' + os.sep + '.HOMEDIR',
-            os.sep + 'gmail.json'
+            os.sep + 'gmail.json', os.sep + 'cps' + os.sep + 'cache'
         )
         additional_path = self.is_venv()
         if additional_path:
diff --git a/cps/web.py b/cps/web.py
index 1b7148ea..64bdd8e4 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -415,7 +415,8 @@ def render_books_list(data, sort, book_id, page):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Books"), page=website, thumbnails=thumbnails)
 
@@ -466,7 +467,7 @@ def render_hot_books(page):
                 ub.delete_download(book.Downloads.book_id)
         numBooks = entries.__len__()
         pagination = Pagination(page, config.config_books_per_page, numBooks)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=_(u"Hot Books (Most Downloaded)"), page="hot", thumbnails=thumbnails)
     else:
@@ -497,7 +498,7 @@ def render_downloaded_books(page, order, user_id):
                 ub.delete_download(book.id)
         user = ub.session.query(ub.User).filter(ub.User.id == user_id).first()
 
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html',
                                      random=random,
                                      entries=entries,
@@ -550,7 +551,7 @@ def render_publisher_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Publisher: %(name)s", name=publisher.name), page="publisher",
                                      thumbnails=thumbnails)
@@ -565,7 +566,7 @@ def render_series_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.series.any(db.Series.id == book_id),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Series: %(serie)s", serie=name.name), page="series",
                                      thumbnails=thumbnails)
@@ -580,7 +581,7 @@ def render_ratings_books(page, book_id, order):
                                                             db.Books.ratings.any(db.Ratings.id == book_id),
                                                             [order[0]])
     if name and name.rating <= 10:
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"Rating: %(rating)s stars", rating=int(name.rating / 2)), page="ratings",
                                      thumbnails=thumbnails)
@@ -595,7 +596,7 @@ def render_formats_books(page, book_id, order):
                                                                 db.Books,
                                                                 db.Books.data.any(db.Data.format == book_id.upper()),
                                                                 [order[0]])
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
                                      title=_(u"File format: %(format)s", format=name.format), page="formats",
                                      thumbnails=thumbnails)
@@ -613,7 +614,7 @@ def render_category_books(page, book_id, order):
                                                                 db.books_series_link,
                                                                 db.Books.id == db.books_series_link.c.book,
                                                                 db.Series)
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
                                      title=_(u"Category: %(name)s", name=name.name), page="category",
                                      thumbnails=thumbnails)
@@ -634,7 +635,7 @@ def render_language_books(page, name, order):
                                                             db.Books,
                                                             db.Books.languages.any(db.Languages.lang_code == name),
                                                             [order[0]])
-    thumbnails = get_thumbnails_for_books(entries + random)
+    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
                                  title=_(u"Language: %(name)s", name=lang_name), page="language", thumbnails=thumbnails)
 
@@ -687,7 +688,7 @@ def render_read_books(page, are_read, as_xml=False, order=None):
             name = _(u'Unread Books') + ' (' + str(pagination.total_count) + ')'
             pagename = "unread"
 
-        thumbnails = get_thumbnails_for_books(entries + random)
+        thumbnails = get_thumbnails_for_books(entries + random if random else entries)
         return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                      title=name, page=pagename, thumbnails=thumbnails)
 
@@ -712,7 +713,7 @@ def render_archived_books(page, order):
 
     name = _(u'Archived Books') + ' (' + str(len(archived_book_ids)) + ')'
     pagename = "archived"
-    thumbnails = get_thumbnails_for_books(entries + random)
+    thumbnails = get_thumbnails_for_books(entries + random if random else entries)
     return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
                                  title=name, page=pagename, thumbnails=thumbnails)
 
@@ -1392,11 +1393,12 @@ def render_adv_search_results(term, offset=None, order=None, limit=None):
         offset = 0
         limit_all = result_count
 
+    entries = q[offset:limit_all]
     thumbnails = get_thumbnails_for_books(entries)
     return render_title_template('search.html',
                                  adv_searchterm=searchterm,
                                  pagination=pagination,
-                                 entries=q[offset:limit_all],
+                                 entries=entries,
                                  result_count=result_count,
                                  title=_(u"Advanced Search"),
                                  page="advsearch",