diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js
index 5be76cafd..b71c85f73 100644
--- a/files/assets/js/emoji_modal.js
+++ b/files/assets/js/emoji_modal.js
@@ -67,13 +67,14 @@ function loadEmojis(form) {
 					let str = ''
 					if (k == 'marsey')
 						{
-							for (const key of Object.keys(v)) {
-								str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${key}')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${key}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${key}.webp" alt="${key}-emoji"></button>`;
+							for (const e of v) {
+								let k = e.toLowerCase().split(" : ")[0];
+								str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${k}')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${k}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${k}.webp" alt="${k}-emoji"></button>`;
 							}
 						}
 					else {
-						for (let j = 0; j < v.length; j++) {
-							str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${v[j]}')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${v[j]}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${v[j]}.webp" alt="${v[j]}-emoji"></button>`;
+						for (const e of v) {
+							str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${e}')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${e}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${e}.webp" alt="${e}-emoji"></button>`;
 						}
 					}
 	
@@ -86,18 +87,21 @@ function loadEmojis(form) {
 			for (const [key, value] of Object.entries(emojis)) {
 				if (key == "marsey")
 				{
-					for (const [key, v] of Object.entries(value)) {
-						if (str.includes(`'${key}'`)) continue;
-						if (key.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(key) || v.match(search_bar.value.toLowerCase())) {
-							str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${key}')" data-bs-toggle="tooltip" title=":${key}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${key}.webp" alt="${key}-emoji"></button>`;
+					for (const e of value) {
+						let arr = e.toLowerCase().split(" : ");
+						let k = arr[0];
+						let v = arr[1];
+						if (str.includes(`'${k}'`)) continue;
+						if (k.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(k) || v.match(search_bar.value.toLowerCase())) {
+							str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${k}')" data-bs-toggle="tooltip" title=":${k}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${k}.webp" alt="${k}-emoji"></button>`;
 						}
 					}
 				}
 				else
 				{
-					for (let i = 0; i < value.length; i++) {
-						if (value[i].match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(value[i])) {
-							str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${value[i]}')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${value[i]}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${value[i]}.webp" alt="${value[i]}-emoji"></button>`;
+					for (const e of value) {
+						if (e.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(e)) {
+							str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${e}')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":${e}:" delay:="0"><img loading="lazy" width=50 src="/static/assets/images/emojis/${e}.webp" alt="${e}-emoji"></button>`;
 						}
 					}
 				}
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 7c29257bb..46a7cf561 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -371,6 +371,7 @@ def disable_signups(v):
 @app.post("/admin/purge_cache")
 @admin_level_required(3)
 def purge_cache(v):
+	cache.clear()
 	response = str(requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data='{"purge_everything":true}'))
 	if response == "<Response [200]>": return {"message": "Cache purged!"}
 	return {"error": "Failed to purge cache."}
diff --git a/files/routes/static.py b/files/routes/static.py
index 424936721..36715d012 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -24,10 +24,8 @@ def marseys(v):
 @app.get("/marsey_list")
 @cache.memoize(timeout=600)
 def marsey_list():
-	marseys = {}
-	for marsey, user in g.db.query(Marsey, User.username).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc()):
-		marseys[marsey.name] = f"{user} {marsey.tags}"
-	return marseys
+	marseys = [f"{x.name} : {y} {x.tags}" for x, y in g.db.query(Marsey, User.username).join(User, User.id==Marsey.author_id).order_by(Marsey.count.desc())]
+	return str(marseys).replace("'",'"')
 
 @app.get("/terms")
 @app.get("/logged_out/terms")
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 78ad9bd69..949126e24 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -86,7 +86,7 @@
 	</div>
 </div>
 
-<script src="/static/assets/js/emoji_modal.js?a=233"></script>
+<script src="/static/assets/js/emoji_modal.js?a=234"></script>
 
 <style>
 	a.emojitab {