diff --git a/server/src/lib/jobs/bms-table-sync.ts b/server/src/lib/jobs/bms-table-sync.ts
index 41755e2de..51abcd0f4 100644
--- a/server/src/lib/jobs/bms-table-sync.ts
+++ b/server/src/lib/jobs/bms-table-sync.ts
@@ -204,9 +204,11 @@ export async function UpdateTable(table: BMSTablesDataset) {
 	for (const level of levels) {
 		const query = {
 			"data¬tableFolders": {
-				table: table.prefix,
-				// just incase some dude tries numbers
-				level: level.toString(),
+				"~elemMatch": {
+					table: table.prefix,
+					// just incase some dude tries numbers
+					level: level.toString(),
+				},
 			},
 		};
 
diff --git a/server/src/utils/folder.ts b/server/src/utils/folder.ts
index 185a17b28..b7fb9f829 100644
--- a/server/src/utils/folder.ts
+++ b/server/src/utils/folder.ts
@@ -59,7 +59,7 @@ export async function ResolveFolderToCharts(
 		const folderDataTransposed: Record<string, unknown> = {};
 
 		for (const key in folder.data) {
-			folderDataTransposed[key.replace(/¬/gu, ".")] = folder.data[key];
+			folderDataTransposed[key.replace(/¬/gu, ".").replace("~", "$")] = folder.data[key];
 		}
 
 		const fx = deepmerge.all([filter, { playtype: folder.playtype }, folderDataTransposed]);