diff --git a/media/css/controls/controls.css b/media/css/controls/controls.css
index 99aade320..ec1d2da6a 100644
--- a/media/css/controls/controls.css
+++ b/media/css/controls/controls.css
@@ -34,7 +34,7 @@ ul.segmented-control {
     color: #61635e;
     text-shadow: 0 1px 0 rgba(255, 255, 255, .4);
     transition: 0.14s ease-in-out background;
-    flex: 1 1 0;
+    flex: 1 1 auto;
     white-space: nowrap;
 }
 
diff --git a/media/css/reader/reader.css b/media/css/reader/reader.css
index 96f7a9500..1b909155c 100644
--- a/media/css/reader/reader.css
+++ b/media/css/reader/reader.css
@@ -5786,6 +5786,7 @@ body {
     line-height: 24px;
     padding-left: 12px;
     padding-right: 12px;
+    white-space: normal;
 }
 
 .NB-sideoption-discover .segmented-control-item a {
diff --git a/media/js/newsblur/models/folders.js b/media/js/newsblur/models/folders.js
index 71c24d8ad..16945eab5 100644
--- a/media/js/newsblur/models/folders.js
+++ b/media/js/newsblur/models/folders.js
@@ -383,8 +383,8 @@ NEWSBLUR.Collections.Folders = Backbone.Collection.extend({
         var feedA = modelA.feed;
         var feedB = modelB.feed;
 
-        if (!feedA || !feedB) {
-            return !feedA ? 1 : -1;
+        if (!feedA || !feedB || !feedA.get('feed_title') || !feedB.get('feed_title')) {
+            return !feedA || !feedA.get('feed_title') ? 1 : -1;
         }
 
         var remove_articles = function (str) {
diff --git a/newsblur_web/settings.py b/newsblur_web/settings.py
index 3df99a02e..3e64437be 100644
--- a/newsblur_web/settings.py
+++ b/newsblur_web/settings.py
@@ -111,10 +111,12 @@ MAX_EMAILS_SENT_PER_DAY_PER_USER = 20  # Most are story notifications
 # ===========================
 
 SHELL_PLUS_IMPORTS = [
-    "from apps.search.models import SearchFeed, SearchStory",
+    "from apps.search.models import SearchFeed, SearchStory, DiscoverStory",
     "import redis",
     "import datetime",
     "from pprint import pprint",
+    "import requests",
+    "import feedparser",
 ]
 # SHELL_PLUS_PRINT_SQL = True