diff --git a/files/assets/images/emojis/marseynapoleon.webp b/files/assets/images/emojis/marseynapoleon.webp
index f86277d0e..64daeb17b 100644
Binary files a/files/assets/images/emojis/marseynapoleon.webp and b/files/assets/images/emojis/marseynapoleon.webp differ
diff --git a/files/assets/images/emojis/marseypizzashill.webp b/files/assets/images/emojis/marseypizzashill.webp
index a26fac6d1..651978097 100644
Binary files a/files/assets/images/emojis/marseypizzashill.webp and b/files/assets/images/emojis/marseypizzashill.webp differ
diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index e8c8f5941..4410707eb 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -104,7 +104,7 @@ function loadEmojis(form) {
 						}
 					}
 				}
-				else
+				else if (key != "marseyalphabet")
 				{
 					for (const e of value) {
 						if (e.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(e)) {
diff --git a/files/routes/comments.py b/files/routes/comments.py
index 1a8519500..98372e9ab 100644
--- a/files/routes/comments.py
+++ b/files/routes/comments.py
@@ -274,7 +274,7 @@ def api_comment(v):
 								return {"error": "Invalid name!"}, 403
 
 							if "author" in marsey: author_id = get_user(marsey["author"]).id
-							elif "author_id" in marsey: author_id = marsey["author_id"]
+							elif "author_id" in marsey: author_id = int(marsey["author_id"])
 							else: abort(400)
 
 							existing = g.db.query(Marsey.name).filter_by(name=name).one_or_none()
diff --git a/files/routes/front.py b/files/routes/front.py
index a220124d2..f0bccdfbc 100644
--- a/files/routes/front.py
+++ b/files/routes/front.py
@@ -131,13 +131,13 @@ def notifications(v):
 						   )
 
 
-@app.get("/")
-@app.get("/logged_out")
-@app.get("/s/<sub>")
-@app.get("/logged_out/s/<sub>")
+@app.get("/", subdomain="<subdomain>")
+@app.get("/logged_out", subdomain="<subdomain>")
+@app.get("/s/<sub>", subdomain="<subdomain>")
+@app.get("/logged_out/s/<sub>", subdomain="<subdomain>")
 @limiter.limit("3/second;30/minute;1000/hour;5000/day")
 @auth_desired
-def front_all(v, sub=None):
+def front_all(v, sub=None, subdomain=None):
 	if sub: sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none()
 	
 	if request.path.startswith('/s/') and not sub: abort(404)
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 3d1725f01..d94d16bb1 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -94,4 +94,4 @@
 	</div>
 </div>
 
-<script src="/static/assets/js/emoji_modal.js?v=256"></script>
\ No newline at end of file
+<script src="/static/assets/js/emoji_modal.js?v=257"></script>
\ No newline at end of file