diff --git a/apps/reader/models.py b/apps/reader/models.py
index 48f359001..24f341434 100644
--- a/apps/reader/models.py
+++ b/apps/reader/models.py
@@ -214,14 +214,16 @@ class UserSubscription(models.Model):
                 pipeline.execute()
                 r.delete(unread_ranked_stories_key)
         
-        current_time = int(time.time() + 60*60*24)
         if not cutoff_date:
-            cutoff_date = datetime.datetime.now() - datetime.timedelta(days=self.user.profile.days_of_story_hashes)
             if read_filter == "unread":
+                cutoff_date = datetime.datetime.now() - datetime.timedelta(days=self.user.profile.days_of_unread)
                 cutoff_date = max(cutoff_date, self.mark_read_date)
+            elif read_filter == "all":
+                cutoff_date = datetime.datetime.now() - datetime.timedelta(days=self.user.profile.days_of_story_hashes)
             elif default_cutoff_date:
                 cutoff_date = default_cutoff_date
 
+        current_time = int(time.time() + 60*60*24)
         if order == 'oldest':
             byscorefunc = rt.zrangebyscore
             if read_filter == 'unread':
diff --git a/newsblur_web/docker_local_settings.py b/newsblur_web/docker_local_settings.py
index 2d17569bc..99189efe9 100644
--- a/newsblur_web/docker_local_settings.py
+++ b/newsblur_web/docker_local_settings.py
@@ -33,7 +33,7 @@ DEBUG_ASSETS = True
 # down verbosity.
 DEBUG_QUERIES = DEBUG
 DEBUG_QUERIES_SUMMARY_ONLY = True
-# DEBUG_QUERIES_SUMMARY_ONLY = False
+DEBUG_QUERIES_SUMMARY_ONLY = False
 
 MEDIA_URL = '/media/'
 IMAGES_URL = '/imageproxy'