diff --git a/rtv/content.py b/rtv/content.py
index 12f9f56..e79b398 100644
--- a/rtv/content.py
+++ b/rtv/content.py
@@ -262,38 +262,38 @@ class SubredditContent(BaseContent):
             display_name = '/r/{}'.format(name)
         else:
             display_name = '/r/{}/{}'.format(name, order)
-
-        if search:
-            submissions = reddit.search(search, name, order)
-
-        else:
-            if name == 'front':
-                if order == 'hot':
-                    submissions = reddit.get_front_page(limit=None)
-                elif order == 'top':
-                    submissions = reddit.get_top(limit=None)
-                elif order == 'rising':
-                    submissions = reddit.get_rising(limit=None)
-                elif order == 'new':
-                    submissions = reddit.get_new(limit=None)
-                elif order == 'controversial':
-                    submissions = reddit.get_controversial(limit=None)
-                else:
-                    raise SubredditError(display_name)
+            
+        if name == 'front':
+            if search:
+                submissions = reddit.search(search, None, order)
+            elif order == 'hot':
+                submissions = reddit.get_front_page(limit=None)
+            elif order == 'top':
+                submissions = reddit.get_top(limit=None)
+            elif order == 'rising':
+                submissions = reddit.get_rising(limit=None)
+            elif order == 'new':
+                submissions = reddit.get_new(limit=None)
+            elif order == 'controversial':
+                submissions = reddit.get_controversial(limit=None)
             else:
-                subreddit = reddit.get_subreddit(name)
-                if order == 'hot':
-                    submissions = subreddit.get_hot(limit=None)
-                elif order == 'top':
-                    submissions = subreddit.get_top(limit=None)
-                elif order == 'rising':
-                    submissions = subreddit.get_rising(limit=None)
-                elif order == 'new':
-                    submissions = subreddit.get_new(limit=None)
-                elif order == 'controversial':
-                    submissions = subreddit.get_controversial(limit=None)
-                else:
-                    raise SubredditError(display_name)
+                raise SubredditError(display_name)
+        else:
+            subreddit = reddit.get_subreddit(name)
+            if search:
+                submissions = reddit.search(search, name, order)
+            elif order == 'hot':
+                submissions = subreddit.get_hot(limit=None)
+            elif order == 'top':
+                submissions = subreddit.get_top(limit=None)
+            elif order == 'rising':
+                submissions = subreddit.get_rising(limit=None)
+            elif order == 'new':
+                submissions = subreddit.get_new(limit=None)
+            elif order == 'controversial':
+                submissions = subreddit.get_controversial(limit=None)
+            else:
+                raise SubredditError(display_name)
 
         # Verify that content exists for the given submission generator.
         # This is necessary because PRAW loads submissions lazily, and