diff --git a/weasyl/controllers/general.py b/weasyl/controllers/general.py
index 6c30f4f7e..d1e05f48e 100644
--- a/weasyl/controllers/general.py
+++ b/weasyl/controllers/general.py
@@ -137,12 +137,30 @@ def search_(request):
             None,
             # Search results
             {
-                "submit": search.browse(
+                "visual": search.browse(
                     userid=request.userid,
                     rating=rating,
                     limit=22,
-                    find="submit",
-                    cat=None,
+                    find="visual",
+                    cat=1000,
+                    backid=None,
+                    nextid=None,
+                ),
+                "literary": search.browse(
+                    userid=request.userid,
+                    rating=rating,
+                    limit=22,
+                    find="literary",
+                    cat=2000,
+                    backid=None,
+                    nextid=None,
+                ),
+                "multimedia": search.browse(
+                    userid=request.userid,
+                    rating=rating,
+                    limit=22,
+                    find="multimedia",
+                    cat=3000,
                     backid=None,
                     nextid=None,
                 ),
diff --git a/weasyl/templates/etc/search.html b/weasyl/templates/etc/search.html
index 3842b86d9..4c8a68bd0 100644
--- a/weasyl/templates/etc/search.html
+++ b/weasyl/templates/etc/search.html
@@ -135,22 +135,40 @@ <h2 class="page-title">${browse_header}</h2>
     $# BROWSE SUMMARY (user hit the "Browse" tab or didn't specify a content type)
     <h2 class="page-title">Browse Content</h2>
 
-    <div id="browse-search-top" class="content">$# there are multiple instances of search-backup-search in this template!
-      <form id="search-backup-search" action="/search" method="GET" class="form">
-        <input name="q" placeholder="Search" title="Search Weasyl" type="search" tabindex="2" class="input" />
-        <p class="color-lighter tags-help"><i><a href="/help/searching" target="_blank">Search terms help</a></i></p>
-      </form>
-    </div>
+    $if results['visual']:
+      <h3 class="pad-left">Visual Submissions</h3>
+      <ul class="thumbnail-grid medium-footprint">
+        $for i in results['visual']:
+          $:{_GRID_ITEM(i, lazy_load=False)}
+        <li class="more"><a class="more" href="/search?find=submit&cat=1000"><i>More</i> <span>Visual Submissions</span></a></li>
+      </ul>
+    $else:
+      There are no visual submissions to display.
 
-    $if results['submit']:
-      <h3 class="pad-left">Submissions</h3>
+    $if results['literary']:
+      <h3 class="pad-left">Literary Submissions</h3>
       <ul class="thumbnail-grid medium-footprint">
-        $for i in results['submit']:
+        $for i in results['literary']:
           $:{_GRID_ITEM(i, lazy_load=False)}
-        <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Submissions</span></a></li>
+        <li class="more"><a class="more" href="/search?find=submit&cat=2000"><i>More</i> <span>Literary Submissions</span></a></li>
       </ul>
     $else:
-      There are no submissions to display.
+      There are no literary submissions to display.
+
+    $if results['multimedia']:
+      <h3 class="pad-left">Multimedia Submissions</h3>
+      <ul class="thumbnail-grid medium-footprint">
+        $for i in results['multimedia']:
+          $:{_GRID_ITEM(i, lazy_load=False)}
+        <li class="more"><a class="more" href="/search?find=submit&cat=3000"><i>More</i> <span>Multimedia Submissions</span></a></li>
+      </ul>
+    $else:
+      There are no multimedia submissions to display.
+
+    $if results['visual'] or results['literary'] or results['multimedia']:
+      <ul class="thumbnail-grid medium-footprint">
+        <li class="more"><a class="more" href="/search?find=submit"><i>More</i> <span>Submissions</span></a></li>
+      </ul>
 
     $if results['char']:
       <h3 class="pad-left">Characters</h3>
@@ -172,5 +190,4 @@ <h3 class="pad-left">Journals</h3>
     $else:
       There are no journals to display.
 
-
 </div>