diff --git a/src/routes/rss.nim b/src/routes/rss.nim
index bba16fb..58fb7de 100644
--- a/src/routes/rss.nim
+++ b/src/routes/rss.nim
@@ -3,7 +3,7 @@ import asyncdispatch, strutils
 import jester
 
 import router_utils, timeline
-import ".."/[cache, agents, search]
+import ".."/[cache, agents, query]
 import ../views/general
 
 include "../views/rss.nimf"
diff --git a/src/routes/search.nim b/src/routes/search.nim
index b22af77..476b3f3 100644
--- a/src/routes/search.nim
+++ b/src/routes/search.nim
@@ -14,6 +14,9 @@ proc createSearchRouter*(cfg: Config) =
       if @"text".len == 0 or "." in @"text":
         resp Http404, showError("Please enter a valid username.", cfg.title)
 
+      if @"text".len > 200:
+        resp Http400, showError("Search input too long.", cfg.title)
+
       if "," in @"text":
         redirect("/" & @"text")
 
diff --git a/src/routes/timeline.nim b/src/routes/timeline.nim
index eb2dcb7..9161994 100644
--- a/src/routes/timeline.nim
+++ b/src/routes/timeline.nim
@@ -64,7 +64,7 @@ proc showTimeline*(name, after: string; query: Option[Query];
   else:
     let
       timeline = await fetchMultiTimeline(names, after, agent, query)
-      html = renderMulti(timeline, names.join(","), prefs, path)
+      html = renderTweetSearch(timeline, prefs, path)
     return renderMain(html, prefs, title, "Multi")
 
 template respTimeline*(timeline: typed) =