diff --git a/src/jsons/status.nim b/src/jsons/status.nim
index be69f48bf..aa403654b 100644
--- a/src/jsons/status.nim
+++ b/src/jsons/status.nim
@@ -55,8 +55,6 @@ proc createJsonApiStatusRouter*(cfg: Config) =
         respJsonError "Invalid tweet ID"
 
       let conv = await getTweet(id, getCursor())
-      if conv == nil:
-        echo "nil conv"
 
       if conv == nil or conv.tweet == nil or conv.tweet.id == 0:
         var error = "Tweet not found"
diff --git a/src/jsons/timeline.nim b/src/jsons/timeline.nim
index f86f71f6a..e58deb353 100644
--- a/src/jsons/timeline.nim
+++ b/src/jsons/timeline.nim
@@ -115,7 +115,7 @@ proc formatProfileAsJson*(profile: Profile): JsonNode =
 
 proc createJsonApiTimelineRouter*(cfg: Config) =
   router jsonapi_timeline:
-    get "/api/i/user/@user_id/?":
+    get "/api/i/user/@user_id":
       cond @"user_id".len > 0
       let username = await getCachedUsername(@"user_id")
       if username.len > 0:
@@ -141,8 +141,8 @@ proc createJsonApiTimelineRouter*(cfg: Config) =
 
     get "/api/@name/?@tab?/?":
       cond '.' notin @"name"
-      cond @"name" notin ["pic", "gif", "video", "search", "settings", "login",
-          "intent", "i"]
+      cond @"name" notin ["pic", "gif", "video", "search", "settings", "login", "intent", "i"]
+      cond @"name".allCharsInSet({'a'..'z', 'A'..'Z', '0'..'9', '_', ','})
       cond @"tab" in ["with_replies", "media", "search", ""]
       let
         prefs = cookiePrefs()