diff --git a/apps/rss_feeds/views.py b/apps/rss_feeds/views.py
index 2237df703..b6886d9d3 100644
--- a/apps/rss_feeds/views.py
+++ b/apps/rss_feeds/views.py
@@ -2,6 +2,7 @@ import datetime
 from utils import log as logging
 from django.shortcuts import get_object_or_404
 from django.http import HttpResponseForbidden
+from django.db import connection
 # from django.db import IntegrityError
 from apps.rss_feeds.models import Feed, merge_feeds
 from apps.reader.models import UserSubscription
@@ -11,14 +12,17 @@ from utils.feed_functions import relative_timeuntil, relative_timesince
 
 @json.json_view
 def feed_autocomplete(request):
+    connection.queries = []
     query = request.GET['term']
-    feeds = Feed.objects.filter(feed_address__icontains=query)
-    if not feeds:
-        feeds = Feed.objects.filter(feed_link__icontains=query)
-    if not feeds:
-        feeds = Feed.objects.filter(feed_title__icontains=query)
+    feeds = []
+    for field in ['feed_address', 'feed_link', 'feed_title']:
+        if not feeds:
+            feeds = Feed.objects.filter(**{'%s__icontains' % field: query}).only(
+                'feed_title', 
+                'feed_address', 
+                'num_subscribers'
+            ).order_by('-num_subscribers')[:5]
     
-    feeds = feeds.order_by('-num_subscribers')[:5]
     feeds = [{
         'value': feed.feed_address,
         'label': feed.feed_title,
diff --git a/media/css/reader.css b/media/css/reader.css
index 9b91e2587..f14cb4248 100644
--- a/media/css/reader.css
+++ b/media/css/reader.css
@@ -2642,7 +2642,7 @@ a.NB-splash-link:hover {
   color: #3F3D6E;
   font-size: 10px;
   font-weight: normal;
-  height: 12px;
+  height: 11px;
   padding: 4px 0 4px 4px;
   overflow: hidden;
 }