diff --git a/data/manifest.yaml b/data/manifest.yaml
index ce6568ca..66f9c971 100644
--- a/data/manifest.yaml
+++ b/data/manifest.yaml
@@ -85089,7 +85089,7 @@ Change Ranger:
     id: 979790
 Changed:
   files:
-    <base>/Save.rvdata:
+    <base>/Save*.rvdata:
       tags:
         - save
       when:
@@ -98405,12 +98405,22 @@ Command & Conquer:
         - os: windows
 'Command & Conquer 3: Tiberium Wars':
   files:
-    <home>/Saved Games/:
+    <home>/Saved Games/Command & Conquer 3 Kane's Wrath:
       tags:
         - save
       when:
         - os: windows
-    <winAppData>//Profiles/<storeUserId>:
+    <home>/Saved Games/Command & Conquer 3 Tiberium Wars:
+      tags:
+        - save
+      when:
+        - os: windows
+    <winAppData>/Command & Conquer 3 Kane's Wrath/Profiles/<storeUserId>:
+      tags:
+        - config
+      when:
+        - os: windows
+    <winAppData>/Command & Conquer 3 Tiberium Wars/Profiles/<storeUserId>:
       tags:
         - config
       when:
@@ -152254,48 +152264,48 @@ Dynasty Feud:
     id: 493180
 'Dynasty Warriors 4: Hyper':
   files:
-    <winDocuments>/KOEI//*.*:
+    <winDocuments>/KOEI/Dynasty Warriors 4 Hyper/*.*:
       tags:
         - config
       when:
         - os: windows
-    <winDocuments>/KOEI//Savedata/*.dat:
+    <winDocuments>/KOEI/Dynasty Warriors 4 Hyper/Savedata/*.dat:
       tags:
         - save
       when:
         - os: windows
 Dynasty Warriors 5 Special:
   files:
-    <winDocuments>/KOEI//Savedata/save.dat:
+    <winDocuments>/KOEI/Dynasty Warriors 5 Special/Savedata/save.dat:
       tags:
         - save
       when:
         - os: windows
-    <winDocuments>/KOEI//inputmap*.dat:
+    <winDocuments>/KOEI/Dynasty Warriors 5 Special/inputmap*.dat:
       tags:
         - config
       when:
         - os: windows
 Dynasty Warriors 6:
   files:
-    <winDocuments>/KOEI//Savedata/save.dat:
+    <winDocuments>/KOEI/Dynasty Warriors 6/Savedata/save.dat:
       tags:
         - save
       when:
         - os: windows
-    <winDocuments>/KOEI//inputmap*.dat:
+    <winDocuments>/KOEI/Dynasty Warriors 6/inputmap*.dat:
       tags:
         - config
       when:
         - os: windows
 Dynasty Warriors 7 with Xtreme Legends:
   files:
-    <winDocuments>/TecmoKoei//Savedata/save.dat:
+    <winDocuments>/TecmoKoei/Dynasty Warriors 7/Savedata/save.dat:
       tags:
         - save
       when:
         - os: windows
-    <winDocuments>/TecmoKoei//inputmap*.dat:
+    <winDocuments>/TecmoKoei/Dynasty Warriors 7/inputmap*.dat:
       tags:
         - config
       when:
@@ -152308,7 +152318,7 @@ Dynasty Warriors 7 with Xtreme Legends:
         when:
           - store: steam
   registry:
-    HKEY_CURRENT_USER/Software/TecmoKoei/:
+    HKEY_CURRENT_USER/Software/TecmoKoei/Dynasty Warriors 7:
       tags:
         - config
   steam:
@@ -152437,7 +152447,7 @@ Dynasty Warriors 9:
     id: 1341200
 Dynasty Warriors Online Z:
   registry:
-    HKEY_CURRENT_USER/Software/KOEI//*.*:
+    HKEY_CURRENT_USER/Software/KOEI/Dynasty Warriors Online Z/*.*:
       tags:
         - config
 Dynetzzle Extended:
@@ -210548,7 +210558,7 @@ GreedFall:
         - config
       when:
         - os: windows
-    <winDocuments>/GreedFall/.fsav:
+    <winDocuments>/GreedFall/*.fsav:
       tags:
         - save
       when:
@@ -222508,7 +222518,7 @@ Hectic Highways:
         - config
       when:
         - os: windows
-    <home>/Documents/Telltale Games/Hector Ep 2/save.save:
+    <home>/Documents/Telltale Games/Hector Ep 2/save*.save:
       tags:
         - save
       when:
@@ -222518,7 +222528,7 @@ Hectic Highways:
         - config
       when:
         - os: windows
-    <home>/Documents/Telltale Games/Hector Ep 3/save.save:
+    <home>/Documents/Telltale Games/Hector Ep 3/save*.save:
       tags:
         - save
       when:
@@ -222528,7 +222538,7 @@ Hectic Highways:
         - config
       when:
         - os: windows
-    <home>/Documents/Telltale Games/Hector Episode 1/save.save:
+    <home>/Documents/Telltale Games/Hector Episode 1/save*.save:
       tags:
         - save
       when:
@@ -410300,12 +410310,12 @@ Samurai Sword VR:
     id: 574150
 Samurai Warriors 2:
   files:
-    <winDocuments>/KOEI//Savedata/save.dat:
+    <winDocuments>/KOEI/Samurai Warriors 2/Savedata/save.dat:
       tags:
         - save
       when:
         - os: windows
-    <winDocuments>/KOEI//inputmap*.dat:
+    <winDocuments>/KOEI/Samurai Warriors 2/inputmap*.dat:
       tags:
         - config
       when:
@@ -410836,7 +410846,7 @@ Sanitarium:
         - save
       when:
         - os: windows
-    <root>/userdata/<storeUserId>/284050/remote/:
+    <root>/userdata/<storeUserId>/284050/remote/EN:
       tags:
         - save
       when:
@@ -410846,7 +410856,7 @@ Sanitarium:
         - config
       when:
         - os: windows
-    <winAppData>/DotEmu/Sanitarium/SAVES/:
+    <winAppData>/DotEmu/Sanitarium/SAVES/EN:
       tags:
         - save
       when:
@@ -487323,7 +487333,7 @@ The Curse of Monkey Island:
         - save
       when:
         - store: gog
-    <base>/Saves/monkey3.c:
+    <base>/Saves/monkey3.c*:
       tags:
         - save
       when:
@@ -487333,7 +487343,7 @@ The Curse of Monkey Island:
         - config
       when:
         - os: windows
-    <base>/Saves/monkey3.s:
+    <base>/Saves/monkey3.s*:
       tags:
         - save
       when:
@@ -523263,12 +523273,12 @@ Touhou Multi Scroll Shooting:
     id: 845880
 Touken Ranbu Warriors:
   files:
-    <winDocuments>/dmmgames_KOEITECMO//Savedata/SAVEDATA_*.BIN:
+    <winDocuments>/dmmgames_KOEITECMO/Touken Ranbu Warriors/Savedata/SAVEDATA_*.BIN:
       tags:
         - save
       when:
         - os: windows
-    <winDocuments>/dmmgames_KOEITECMO//Savedata/inputmap*.dat:
+    <winDocuments>/dmmgames_KOEITECMO/Touken Ranbu Warriors/Savedata/inputmap*.dat:
       tags:
         - config
       when:
@@ -523280,7 +523290,7 @@ Touken Ranbu Warriors:
       - when:
           - store: steam
   registry:
-    HKEY_CURRENT_USER/Software/dmmgames_KOEITECMO//Graphic Setting/*:
+    HKEY_CURRENT_USER/Software/dmmgames_KOEITECMO/Touken Ranbu Warriors/Graphic Setting/*:
       tags:
         - config
   steam:
diff --git a/data/wiki-game-cache.yaml b/data/wiki-game-cache.yaml
index e79ba191..bb65e1d2 100644
--- a/data/wiki-game-cache.yaml
+++ b/data/wiki-game-cache.yaml
@@ -36828,18 +36828,18 @@ Dynasty Warriors 6:
 Dynasty Warriors 7 with Xtreme Legends:
   irregularPath: true
   pageId: 40410
-  revId: 1257714
+  revId: 1257939
 'Dynasty Warriors 7: Xtreme Legends Definitive Edition':
   pageId: 123313
   revId: 1255691
 'Dynasty Warriors 8: Empires':
   irregularPath: true
   pageId: 22801
-  revId: 1227425
+  revId: 1257934
 'Dynasty Warriors 8: Xtreme Legends':
   irregularPath: true
   pageId: 17223
-  revId: 1241719
+  revId: 1257936
 Dynasty Warriors 9:
   pageId: 83036
   revId: 1231034
@@ -43661,7 +43661,7 @@ Final Fantasy VII (2012):
 Final Fantasy VII Remake Intergrade:
   irregularPath: true
   pageId: 173585
-  revId: 1257560
+  revId: 1257963
 Final Fantasy VIII:
   pageId: 583
   revId: 1257856
@@ -127599,7 +127599,7 @@ Touhou Multi Scroll Shooting:
 Touken Ranbu Warriors:
   irregularPath: true
   pageId: 175293
-  revId: 1257703
+  revId: 1257942
 Toukiden 2:
   pageId: 59075
   revId: 1231542
diff --git a/src/manifest.ts b/src/manifest.ts
index ff9b1cb4..5e5771f1 100644
--- a/src/manifest.ts
+++ b/src/manifest.ts
@@ -158,6 +158,11 @@ function integrateSteamData(game: Game, appInfo: SteamGameCache[""]) {
     }
 }
 
+function isPathRegular(path: string): boolean {
+    const irregular = ["{{", "</", "/>", "<br>", "//"];
+    return !irregular.some(x => path.includes(x))
+}
+
 export class ManifestFile extends YamlFile<Manifest> {
     path = `${REPO}/data/manifest.yaml`;
     defaultData = {};
@@ -224,8 +229,8 @@ export class ManifestFile extends YamlFile<Manifest> {
                 filter.irregularPathUntagged &&
                 !wikiCache[title].irregularPath &&
                 (
-                    Object.keys(this.data[title]?.files ?? []).some(x => x.includes("{{") || x.includes("</") || x.includes("/>") || x.includes("<br>")) ||
-                    Object.keys(this.data[title]?.registry ?? []).some(x => x.includes("{{") || x.includes("</") || x.includes("/>") || x.includes("<br>"))
+                    Object.keys(this.data[title]?.files ?? []).some(x => !isPathRegular(x)) ||
+                    Object.keys(this.data[title]?.registry ?? []).some(x => !isPathRegular(x))
                 )
             ) {
                 check = true;