diff --git a/bemani/frontend/museca/endpoints.py b/bemani/frontend/museca/endpoints.py
index 6aff293..49d6cef 100644
--- a/bemani/frontend/museca/endpoints.py
+++ b/bemani/frontend/museca/endpoints.py
@@ -101,7 +101,6 @@ def viewnetworkrecords() -> Response:
     frontend = MusecaFrontend(g.data, g.config, g.cache)
     network_records = frontend.get_network_records()
     versions = {version: name for (game, version, name) in frontend.all_games()}
-    versions[10002] = 'MÚSECA PLUS'
 
     return render_react(
         'Global MÚSECA Records',
@@ -139,7 +138,6 @@ def viewrecords(userid: UserID) -> Response:
     if info is None:
         abort(404)
     versions = {version: name for (game, version, name) in frontend.all_games()}
-    versions[10002] = 'MÚSECA PLUS'  # Hard code this version name for modpack songs
 
     return render_react(
         f'{info["name"]}\'s MÚSECA Records',
diff --git a/bemani/frontend/museca/museca.py b/bemani/frontend/museca/museca.py
index 3a76bf1..049b834 100644
--- a/bemani/frontend/museca/museca.py
+++ b/bemani/frontend/museca/museca.py
@@ -24,6 +24,7 @@ class MusecaFrontend(FrontendBase):
 
     def all_games(self) -> Iterator[Tuple[str, int, str]]:
         yield from MusecaFactory.all_games()
+        yield ('museca', 10002, 'MÚSECA PLUS')  # Hard code entry for MÚSECA PLUS since entries will go in blank category otherwise
 
     def format_score(self, userid: UserID, score: Score) -> Dict[str, Any]:
         formatted_score = super().format_score(userid, score)
diff --git a/bemani/frontend/popn/endpoints.py b/bemani/frontend/popn/endpoints.py
index a86a9b2..03ab383 100644
--- a/bemani/frontend/popn/endpoints.py
+++ b/bemani/frontend/popn/endpoints.py
@@ -101,7 +101,6 @@ def viewnetworkrecords() -> Response:
     frontend = PopnMusicFrontend(g.data, g.config, g.cache)
     network_records = frontend.get_network_records()
     versions = {version: name for (game, version, name) in frontend.all_games()}
-    versions[0] = 'CS and Licenses'
 
     return render_react(
         'Global Pop\'n Music Records',
@@ -139,7 +138,6 @@ def viewrecords(userid: UserID) -> Response:
     if info is None:
         abort(404)
     versions = {version: name for (game, version, name) in frontend.all_games()}
-    versions[0] = 'CS and Licenses'
 
     return render_react(
         f'{info["name"]}\'s Pop\'n Music Records',
diff --git a/bemani/frontend/popn/popn.py b/bemani/frontend/popn/popn.py
index afc24e6..4372081 100644
--- a/bemani/frontend/popn/popn.py
+++ b/bemani/frontend/popn/popn.py
@@ -33,6 +33,7 @@ class PopnMusicFrontend(FrontendBase):
 
     def all_games(self) -> Iterator[Tuple[str, int, str]]:
         yield from PopnMusicFactory.all_games()
+        yield ('pnm', 0, 'CS and Licenses')  # Folder that doesn't belong to any specific game
 
     def format_score(self, userid: UserID, score: Score) -> Dict[str, Any]:
         formatted_score = super().format_score(userid, score)
diff --git a/bemani/utils/read.py b/bemani/utils/read.py
index 7de8618..0c438df 100644
--- a/bemani/utils/read.py
+++ b/bemani/utils/read.py
@@ -2843,13 +2843,9 @@ class ImportMuseca(ImportBase):
             actual_version = {
                 '1': VersionConstants.MUSECA,
                 '1+1/2': VersionConstants.MUSECA_1_PLUS,
+                'plus': VersionConstants.MUSECA_1_PLUS + DBConstants.OMNIMIX_VERSION_BUMP,
             }.get(version, -1)
-        elif version == 'plus':
-            actual_version = VersionConstants.MUSECA_1_PLUS + DBConstants.OMNIMIX_VERSION_BUMP
-
-        if actual_version in [VersionConstants.MUSECA, VersionConstants.MUSECA_1_PLUS]:
-            self.charts = [0, 1, 2, 3]
-        elif actual_version == VersionConstants.MUSECA_1_PLUS + DBConstants.OMNIMIX_VERSION_BUMP:
+        if actual_version in [VersionConstants.MUSECA, VersionConstants.MUSECA_1_PLUS, VersionConstants.MUSECA_1_PLUS + DBConstants.OMNIMIX_VERSION_BUMP]:
             self.charts = [0, 1, 2, 3]
         else:
             raise Exception("Unsupported Museca version, expected one of the following: 1, 1+1/2, plus!")