diff --git a/original_post_discovery.py b/original_post_discovery.py
index ffd3c629..f7eac605 100644
--- a/original_post_discovery.py
+++ b/original_post_discovery.py
@@ -70,6 +70,9 @@ def discover(source, activity, fetch_hfeed=True, include_redirect_sources=True):
   obj = activity.get('object') or activity
   author_id = obj.get('author', {}).get('id')
   if author_id and author_id != source.user_tag_id():
+    logging.warning(
+      "Demoting original post links because user %s doesn't match author of %s",
+      source.user_tag_id(), activity)
     # this is someone else's post, so all links must be mentions
     mentions.update(originals)
     originals = set()
diff --git a/tasks.py b/tasks.py
index 7be93de0..f3256062 100644
--- a/tasks.py
+++ b/tasks.py
@@ -141,8 +141,9 @@ def poll(self, source):
       response = source.get_activities_response(**kwargs)
       activities += response.get('items', [])
       for domain in source.domains:
-        activities += source.get_activities_response(
-          search_query='"%s"' % domain, **kwargs).get('items', [])
+        if appengine_config.DEBUG or domain in util.LOCALHOST_TEST_DOMAINS:
+          activities += source.get_activities_response(
+            search_query='"%s"' % domain, **kwargs).get('items', [])
     except NotImplementedError:
       # this source doesn't support search
       pass