diff --git a/files/classes/marsey.py b/files/classes/marsey.py
index 70ac34c53..a7cfef2ee 100644
--- a/files/classes/marsey.py
+++ b/files/classes/marsey.py
@@ -22,12 +22,15 @@ class Marsey(Base):
 	def __repr__(self):
 		return f"<Marsey(name={self.name})>"
 
+	def tags_list(self):
+		return self.tags.split(" ") + [self.name[len("marsey"):]]  # type: ignore
+
 	def json(self):
 		return {
 			"name": self.name,
 			"author_id": self.author_id,
 			"submitter_id": self.submitter_id,
-			"tags": self.tags.split(' '),
+			"tags": self.tags_list(),
 			"count": self.count,
 			"created_utc": self.created_utc
 		}
diff --git a/files/routes/static.py b/files/routes/static.py
index e728e8893..3de9c8137 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -47,7 +47,6 @@ def get_marseys(db:scoped_session):
 	marseys = []
 	for marsey, author in db.query(Marsey, User).join(User, Marsey.author_id == User.id).filter(Marsey.submitter_id == None).order_by(Marsey.count.desc()):
 		marsey.author = author.username if FEATURES['ASSET_SUBMISSIONS'] or author == "anton-d" else None
-		marsey.tags = marsey.tags.split(" ") + [marsey.name[len("marsey"):]]
 		setattr(marsey, "class", "Marsey")
 		marseys.append(marsey)
 	return marseys