diff --git a/extensions.py b/extensions.py
index 15bf219..28562c0 100644
--- a/extensions.py
+++ b/extensions.py
@@ -7,7 +7,14 @@ from config import app
 
 def humanize_tags_from_json(value: str, default: str) -> str:
     if value != "":
-        return ", ".join([re.sub('_\\(.*', '', t) for t in value.split()])
+        output = str()
+        tags = value.split()
+
+        for t in tags:
+            output += f"{re.sub('_\\(.*', '', t)}, "
+        output = output[:-2]
+
+        return output
     return default
 
 
diff --git a/inline_query.py b/inline_query.py
index 657e0b9..e8c6151 100644
--- a/inline_query.py
+++ b/inline_query.py
@@ -40,7 +40,8 @@ async def answer_query(update: Update, query: str, data) -> None:
                 title=f"ID: {query}",
                 description=f"{characters} ({copyrights}) drawn by {artists}",
                 input_message_content=InputTextMessageContent(
-                    f"<code>#{query}</code> <s><b>{characters} ({copyrights})</b> drawn by <b>{artists}</b></s> {rating}\n"
+                    f"ID: <code>{query}</code> {rating}\n"
+                    f"<s><b>{characters} ({copyrights})</b> drawn by <b>{artists}</b></s>\n"
                     f"This post has been removed because of a takedown request or rule violation.",
                     parse_mode=ParseMode.HTML
                 )
@@ -65,7 +66,8 @@ async def answer_query(update: Update, query: str, data) -> None:
             description=f"{characters} ({copyrights}) drawn by {artists}",
             thumbnail_url=data['preview_file_url'],
             input_message_content=InputTextMessageContent(
-                f"<code>#{query}</code> <b>{characters} ({copyrights})</b> drawn by <b>{artists}</b> {rating}",
+                f"ID: <code>{query}</code> {rating}\n"
+                f"<b>{characters} ({copyrights})</b> drawn by <b>{artists}</b>",
                 parse_mode=ParseMode.HTML,
                 link_preview_options=LinkPreviewOptions(url=data['large_file_url'])
             ),
@@ -83,7 +85,7 @@ async def invalid_query(update: Update, query: str) -> None:
             title=f"ID: {query}",
             description="Error",
             input_message_content=InputTextMessageContent(
-                f"<code>#{query}</code>\n"
+                f"ID: <code>{query}</code>\n"
                 f"That record was not found.",
                 parse_mode=ParseMode.HTML
             )