diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index cbadc5e108..c883adc06d 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -36155,104 +36155,196 @@ SLPS-01215:
     linkCable: false
 SLPM-80071:
   name: "Dengeki PlayStation D (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80513:
   name: "Dengeki PlayStation D - Konami Fanbook (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80281:
   name: "Dengeki PlayStation D10 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80327:
   name: "Dengeki PlayStation D11 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90060:
   name: "Dengeki PlayStation D11 - Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80343:
   name: "Dengeki PlayStation D12 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80362:
   name: "Dengeki PlayStation D13 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80331:
   name: "Dengeki PlayStation D14 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80388:
   name: "Dengeki PlayStation D15 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80399:
   name: "Dengeki PlayStation D16 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80418:
   name: "Dengeki PlayStation D17 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80412:
   name: "Dengeki PlayStation D18 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80425:
   name: "Dengeki PlayStation D19 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80109:
   name: "Dengeki PlayStation D2 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80438:
   name: "Dengeki PlayStation D20 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80457:
   name: "Dengeki PlayStation D21 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96159:
   name: "Dengeki PlayStation D21 SCE Special (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80471:
   name: "Dengeki PlayStation D22 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80481:
   name: "Dengeki PlayStation D23 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80496:
   name: "Dengeki PlayStation D24 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80497:
   name: "Dengeki PlayStation D25 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80505:
   name: "Dengeki PlayStation D26 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80516:
   name: "Dengeki PlayStation D27 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80526:
   name: "Dengeki PlayStation D28 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80545:
   name: "Dengeki PlayStation D29 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80130:
   name: "Dengeki PlayStation D3 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80547:
   name: "Dengeki PlayStation D30 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80555:
   name: "Dengeki PlayStation D31 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80557:
   name: "Dengeki PlayStation D32 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80562:
   name: "Dengeki PlayStation D33 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80569:
   name: "Dengeki PlayStation D34 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80574:
   name: "Dengeki PlayStation D35 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80578:
   name: "Dengeki PlayStation D36 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80582:
   name: "Dengeki PlayStation D37 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80589:
   name: "Dengeki PlayStation D38 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80603:
   name: "Dengeki PlayStation D39 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80157:
   name: "Dengeki PlayStation D4 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80607:
   name: "Dengeki PlayStation D41 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80611:
   name: "Dengeki PlayStation D42 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80612:
   name: "Dengeki PlayStation D43 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80615:
   name: "Dengeki PlayStation D44 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80618:
   name: "Dengeki PlayStation D45 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80186:
   name: "Dengeki PlayStation D5 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80214:
   name: "Dengeki PlayStation D6 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80309:
   name: "Dengeki PlayStation D7 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80257:
   name: "Dengeki PlayStation D8 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96116:
   name: "Dengeki PlayStation D8 - Yarudora Series Vol. 1 - Double Cast (Japan) (Demo)"
   metadata:
     genre: "** DEMO **"
 SLPM-80266:
   name: "Dengeki PlayStation D9 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02851:
   name: "Denkousekka Micro Runner - Maniac Hakase no Hisaku (Japan)"
   controllers:
@@ -46483,7 +46575,13 @@ SLUS-00842:
     maxBlocks: 2
     vibration: true
     multitap: false
-    linkCable: false
+    linkCable: false    
+SLUS-90053:
+  name: "Driver - You Are the Wheelman (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
+    languages:
+      - English  
 SLUS-90093:
   name: "Driver 2 (USA) (Demo)"
   metadata:
@@ -49751,28 +49849,52 @@ SLUS-01462:
     linkCable: false
 SCED-00502:
   name: "Essential PlayStation 1 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01141:
   name: "Essential PlayStation 10 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01142:
   name: "Essential PlayStation 11 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01143:
   name: "Essential PlayStation 12 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00572:
   name: "Essential PlayStation 2 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00636:
   name: "Essential PlayStation 3 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00938:
   name: "Essential PlayStation 4 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01004:
   name: "Essential PlayStation 5 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00751:
   name: "Essential PlayStation 6 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01110:
   name: "Essential PlayStation 7 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01139:
   name: "Essential PlayStation 8 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01140:
   name: "Essential PlayStation 9 (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01704:
   name: "Esto Es Futbol (Spain)"
   controllers:
@@ -50050,6 +50172,7 @@ SLES-00107-2:
     - DigitalController
   codes:
     - HASH-AAD8E924C9D6759C
+    - SCES-00107
   metadata:
     publisher: "Eidos Interactive"
     developer: "Core Design"
@@ -58231,11 +58354,15 @@ SCUS-94961:
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
+  metadata:
+    genre: "** DEMO **"
 SCUS-94179:
   name: "Final Fantasy VII (USA) (Square Soft on PlayStation Previews)"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
+  metadata:
+    genre: "** DEMO **"
 SCPS-45007:
   name: "Final Fantasy VII (aka Final Fantasy 7 or FF7)"
   controllers:
@@ -75552,8 +75679,12 @@ SLPM-86056:
     linkCable: false
 SLPM-80183:
   name: "Hyper PlayStation Re-mix 1998 No. 1 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80292:
   name: "Hyper PlayStation Re-mix 1998 No. 10 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80317:
   name: "Hyper PlayStation Re-mix 1998 No. 11 (Japan) (Disc 1)"
   discSet:
@@ -75561,6 +75692,8 @@ SLPM-80317:
     serials:
       - SLPM-80317
       - PAPX-90059
+  metadata:
+    genre: "** DEMO **"
 PAPX-90059:
   name: "Hyper PlayStation Re-mix 1998 No. 11 (Japan) (Disc 2)"
   discSet:
@@ -75568,18 +75701,32 @@ PAPX-90059:
     serials:
       - SLPM-80317
       - PAPX-90059
+  metadata:
+    genre: "** DEMO **"
 SLPM-80337:
   name: "Hyper PlayStation Re-mix 1998 No. 12 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80199:
   name: "Hyper PlayStation Re-mix 1998 No. 2 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80217:
   name: "Hyper PlayStation Re-mix 1998 No. 3 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80228:
   name: "Hyper PlayStation Re-mix 1998 No. 4 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80308:
   name: "Hyper PlayStation Re-mix 1998 No. 5 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80237:
   name: "Hyper PlayStation Re-mix 1998 No. 6 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80248:
   name: "Hyper PlayStation Re-mix 1998 No. 7 (Japan) (Disc 1)"
   discSet:
@@ -75587,6 +75734,8 @@ SLPM-80248:
     serials:
       - SLPM-80248
       - PCPX-96115
+  metadata:
+    genre: "** DEMO **"
 PCPX-96115:
   name: "Hyper PlayStation Re-mix 1998 No. 7 (Japan) (Disc 2) (Yarudora Series Vol. 1 - Double Cast)"
   discSet:
@@ -75594,32 +75743,60 @@ PCPX-96115:
     serials:
       - SLPM-80248
       - PCPX-96115
+  metadata:
+    genre: "** DEMO **"
 SLPM-80264:
   name: "Hyper PlayStation Re-mix 1998 No. 8 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80279:
   name: "Hyper PlayStation Re-mix 1998 No. 9 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80357:
   name: "Hyper PlayStation Re-mix 1999 No. 1 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80480:
   name: "Hyper PlayStation Re-mix 1999 No. 10 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80495:
   name: "Hyper PlayStation Re-mix 1999 No. 11 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80504:
   name: "Hyper PlayStation Re-mix 1999 No. 12 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80369:
   name: "Hyper PlayStation Re-mix 1999 No. 2 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80384:
   name: "Hyper PlayStation Re-mix 1999 No. 3 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80400:
   name: "Hyper PlayStation Re-mix 1999 No. 4 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80416:
   name: "Hyper PlayStation Re-mix 1999 No. 5 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80424:
   name: "Hyper PlayStation Re-mix 1999 No. 6 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80439:
   name: "Hyper PlayStation Re-mix 1999 No. 7 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80456:
   name: "Hyper PlayStation Re-mix 1999 No. 8 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80470:
   name: "Hyper PlayStation Re-mix 1999 No. 9 (Japan) (Disc 1)"
   discSet:
@@ -75627,6 +75804,8 @@ SLPM-80470:
     serials:
       - SLPM-80470
       - PCPX-96170
+  metadata:
+    genre: "** DEMO **"
 PCPX-96170:
   name: "Hyper PlayStation Re-mix 1999 No. 9 (Japan) (Disc 2) (Sony Computer Entertainment Special)"
   discSet:
@@ -75634,28 +75813,52 @@ PCPX-96170:
     serials:
       - SLPM-80470
       - PCPX-96170
+  metadata:
+    genre: "** DEMO **"
 SLPM-80514:
   name: "Hyper PlayStation Re-mix 2000 No. 1 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80525:
   name: "Hyper PlayStation Re-mix 2000 No. 2 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80050:
   name: "Hyper PlayStation Re-mix No. 1 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80146:
   name: "Hyper PlayStation Re-mix No. 10 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80152:
   name: "Hyper PlayStation Re-mix No. 11 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80167:
   name: "Hyper PlayStation Re-mix No. 12 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80058:
   name: "Hyper PlayStation Re-mix No. 2 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80072:
   name: "Hyper PlayStation Re-mix No. 3 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80090:
   name: "Hyper PlayStation Re-mix No. 4 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80099:
   name: "Hyper PlayStation Re-mix No. 5 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80106:
   name: "Hyper PlayStation Re-mix No. 6 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80113:
   name: "Hyper PlayStation Re-mix No. 7 (Japan) (Disc 1)"
   discSet:
@@ -75663,6 +75866,8 @@ SLPM-80113:
     serials:
       - SLPM-80113
       - SLPM-80114
+  metadata:
+    genre: "** DEMO **"
 SLPM-80114:
   name: "Hyper PlayStation Re-mix No. 7 (Japan) (Disc 2)"
   discSet:
@@ -75670,10 +75875,16 @@ SLPM-80114:
     serials:
       - SLPM-80113
       - SLPM-80114
+  metadata:
+    genre: "** DEMO **"
 SLPM-80122:
   name: "Hyper PlayStation Re-mix No. 8 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80134:
   name: "Hyper PlayStation Re-mix No. 9 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01417:
   name: "Hyper Securities 2 (Japan)"
   controllers:
@@ -77012,6 +77223,8 @@ PBPX-95004:
     - PBPX-95004
     - SCUS-94242
     - SCUS-94252
+  metadata:
+    genre: "** DEMO **"
 PBPX-95011:
   name: "Interactive CD Sampler Disc Vol. 10 (USA)"
   compatibility:
@@ -77020,16 +77233,22 @@ PBPX-95011:
   codes:
     - PBPX-95011
     - SCUS-94382
+  metadata:
+    genre: "** DEMO **"
 SCUS-94463:
   name: "Interactive CD Sampler Disc Vol. 11 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94295:
   name: "Interactive CD Sampler Disc Vol. 9 (USA) (SCUS-94295)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
+  metadata:
+    genre: "** DEMO **"
 PBPX-95002:
   name: "Interactive CD Sampler Disc Volume 4 (USA)"
   compatibility:
@@ -77038,6 +77257,8 @@ PBPX-95002:
   codes:
     - PBPX-95002
     - SCUS-94418
+  metadata:
+    genre: "** DEMO **"
 PBPX-95006:
   name: "Interactive CD Sampler Disc Volume 7 (USA)"
   compatibility:
@@ -77047,6 +77268,8 @@ PBPX-95006:
     - PBPX-95006
     - SCUS-94258
     - SCUS-94262
+  metadata:
+    genre: "** DEMO **"
 PBPX-95009:
   name: "Interactive CD Sampler Disc Volume 8 (USA)"
   compatibility:
@@ -77056,6 +77279,8 @@ PBPX-95009:
     - PBPX-95009
     - SCUS-94268
     - SCUS-94273
+  metadata:
+    genre: "** DEMO **"
 PBPX-95003:
   name: "Interactive CD Sampler Disk Volume 5 (USA)"
   compatibility:
@@ -77064,6 +77289,8 @@ PBPX-95003:
   codes:
     - PBPX-95003
     - SCUS-94232
+  metadata:
+    genre: "** DEMO **"
 SCUS-94222:
   name: "Interactive CD Sampler Disk Volume 5 (USA) (Rev 1)"
   metadata:
@@ -77077,26 +77304,36 @@ SCUS-94957:
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94959:
   name: "Interactive CD Sampler Pack Volume 3 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94966:
   name: "Interactive CD Sampler Pack Volume 3.5 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94177:
   name: "Interactive CD Sampler Pack Volume 3.5 (USA) (Rev 1) (SCUS-94177)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1490-g76978986"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94955:
   name: "Interactive CD Sampler Volume 1 (USA)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94956:
   name: "Interactive CD Sampler Volume 1 (USA) (SCUS-94956)"
   metadata:
@@ -113604,10 +113841,16 @@ SLPS-00858:
     linkCable: false
 SLED-01750:
   name: "Next Station 1 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01873:
   name: "Next Station 2 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01953:
   name: "Next Station 3 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02507:
   name: "Next Tetris DLX, The (Japan)"
   controllers:
@@ -125529,6 +125772,8 @@ SCUS-94678:
     genre: "** DEMO **"
 PCPX-96095:
   name: "PlayStation Official Catalog CD-ROM (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94952:
   name: "PlayStation Picks (USA) (SCUS-94952)"
   compatibility:
@@ -125537,6 +125782,8 @@ SCUS-94952:
   codes:
     - SCUS-94952
     - SPUS-94951
+  metadata:
+    genre: "** DEMO **"
 SCUS-94960:
   name: "PlayStation Picks (USA) (SCUS-94960)"
   compatibility:
@@ -125555,6 +125802,8 @@ SCED-01049:
     genre: "** DEMO **"
 SCED-03103:
   name: "PlayStation Speziale Italia (Italy)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94440:
   name: "PlayStation Underground 3.1 (USA) (Disc 1)"
   discSet:
@@ -125565,6 +125814,8 @@ SCUS-94440:
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1539-gf704cc64"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94441:
   name: "PlayStation Underground 3.1 (USA) (Disc 2)"
   discSet:
@@ -125572,6 +125823,8 @@ SCUS-94441:
     serials:
       - SCUS-94440
       - SCUS-94441
+  metadata:
+    genre: "** DEMO **"
 SCUS-94442:
   name: "PlayStation Underground 3.2 (USA) (Disc 1)"
   discSet:
@@ -125579,6 +125832,8 @@ SCUS-94442:
     serials:
       - SCUS-94442
       - SCUS-94443
+  metadata:
+    genre: "** DEMO **"
 SCUS-94443:
   name: "PlayStation Underground 3.2 (USA) (Disc 2)"
   discSet:
@@ -125586,6 +125841,8 @@ SCUS-94443:
     serials:
       - SCUS-94442
       - SCUS-94443
+  metadata:
+    genre: "** DEMO **"
 SCUS-94444:
   name: "PlayStation Underground 3.3 (USA) (Disc 1)"
   discSet:
@@ -125593,6 +125850,8 @@ SCUS-94444:
     serials:
       - SCUS-94444
       - SCUS-94445
+  metadata:
+    genre: "** DEMO **"
 SCUS-94445:
   name: "PlayStation Underground 3.3 (USA) (Disc 2)"
   discSet:
@@ -125600,6 +125859,8 @@ SCUS-94445:
     serials:
       - SCUS-94444
       - SCUS-94445
+  metadata:
+    genre: "** DEMO **"
 SCUS-94446:
   name: "PlayStation Underground 3.4 (USA) (Disc 1)"
   discSet:
@@ -125607,6 +125868,8 @@ SCUS-94446:
     serials:
       - SCUS-94446
       - SCUS-94447
+  metadata:
+    genre: "** DEMO **"
 SCUS-94447:
   name: "PlayStation Underground 3.4 (USA) (Disc 2)"
   discSet:
@@ -125614,6 +125877,8 @@ SCUS-94447:
     serials:
       - SCUS-94446
       - SCUS-94447
+  metadata:
+    genre: "** DEMO **"
 SCUS-94565:
   name: "PlayStation Underground 4.1 (USA) (Disc 1)"
   discSet:
@@ -125621,6 +125886,8 @@ SCUS-94565:
     serials:
       - SCUS-94565
       - SCUS-94566
+  metadata:
+    genre: "** DEMO **"
 SCUS-94566:
   name: "PlayStation Underground 4.1 (USA) (Disc 2)"
   discSet:
@@ -125628,6 +125895,8 @@ SCUS-94566:
     serials:
       - SCUS-94565
       - SCUS-94566
+  metadata:
+    genre: "** DEMO **"
 SCUS-94612:
   name: "PlayStation Underground 4.2 (USA) (Disc 1)"
   discSet:
@@ -125635,6 +125904,8 @@ SCUS-94612:
     serials:
       - SCUS-94612
       - SCUS-94613
+  metadata:
+    genre: "** DEMO **"
 SCUS-94613:
   name: "PlayStation Underground 4.2 (USA) (Disc 2)"
   discSet:
@@ -125642,6 +125913,8 @@ SCUS-94613:
     serials:
       - SCUS-94612
       - SCUS-94613
+  metadata:
+    genre: "** DEMO **"
 SCUS-94620:
   name: "PlayStation Underground 4.3 (USA) (Disc 1)"
   discSet:
@@ -125649,6 +125922,8 @@ SCUS-94620:
     serials:
       - SCUS-94620
       - SCUS-94621
+  metadata:
+    genre: "** DEMO **"
 SCUS-94621:
   name: "PlayStation Underground 4.3 (USA) (Disc 2)"
   discSet:
@@ -125656,6 +125931,8 @@ SCUS-94621:
     serials:
       - SCUS-94620
       - SCUS-94621
+  metadata:
+    genre: "** DEMO **"
 SCUS-97120:
   name: "PlayStation Underground 4.4 (USA) (Disc 1)"
 SCUS-94267:
@@ -125663,25 +125940,43 @@ SCUS-94267:
   codes:
     - SCUS-94267
     - SCUS-94287
+  metadata:
+    genre: "** DEMO **"
 SCUS-94657:
   name: "PlayStation Underground Jampack - Fall 2001 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94428:
   name: "PlayStation Underground Jampack - Summer '99 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94587:
   name: "PlayStation Underground Jampack - Summer 2K (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94293:
   name: "PlayStation Underground Jampack - Winter '98 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94475:
   name: "PlayStation Underground Jampack - Winter '99 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94624:
   name: "PlayStation Underground Jampack - Winter 2000 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94161:
   name: "PlayStation Underground Number 1 (USA) (Disc 1)"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1539-gf704cc64"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94178:
   name: "PlayStation Underground Number 2 (USA) (Disc 1)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94191:
   name: "PlayStation Underground Number 3 (USA) (Disc 1)"
   discSet:
@@ -125689,6 +125984,8 @@ SCUS-94191:
     serials:
       - SCUS-94191
       - SCUS-94192
+  metadata:
+    genre: "** DEMO **"
 SCUS-94192:
   name: "PlayStation Underground Number 3 (USA) (Disc 2)"
   discSet:
@@ -125696,6 +125993,8 @@ SCUS-94192:
     serials:
       - SCUS-94191
       - SCUS-94192
+  metadata:
+    genre: "** DEMO **"
 SCUS-94225:
   name: "PlayStation Underground Number 4 (USA) (Disc 1)"
   discSet:
@@ -125703,6 +126002,8 @@ SCUS-94225:
     serials:
       - SCUS-94225
       - SCUS-94226
+  metadata:
+    genre: "** DEMO **"
 SCUS-94226:
   name: "PlayStation Underground Number 4 (USA) (Disc 2)"
   discSet:
@@ -125710,6 +126011,8 @@ SCUS-94226:
     serials:
       - SCUS-94225
       - SCUS-94226
+  metadata:
+    genre: "** DEMO **"
 SCUS-94237:
   name: "PlayStation Underground Volume 2 Issue 1 (USA) (Disc 1)"
   discSet:
@@ -125717,6 +126020,8 @@ SCUS-94237:
     serials:
       - SCUS-94237
       - SCUS-94238
+  metadata:
+    genre: "** DEMO **"
 SCUS-94238:
   name: "PlayStation Underground Volume 2 Issue 1 (USA) (Disc 2)"
   discSet:
@@ -125724,6 +126029,8 @@ SCUS-94238:
     serials:
       - SCUS-94237
       - SCUS-94238
+  metadata:
+    genre: "** DEMO **"
 SCUS-94259:
   name: "PlayStation Underground Volume 2 Issue 2 (USA) (Disc 1)"
   discSet:
@@ -125731,6 +126038,8 @@ SCUS-94259:
     serials:
       - SCUS-94259
       - SCUS-94260
+  metadata:
+    genre: "** DEMO **"
 SCUS-94260:
   name: "PlayStation Underground Volume 2 Issue 2 (USA) (Disc 2)"
   discSet:
@@ -125738,6 +126047,8 @@ SCUS-94260:
     serials:
       - SCUS-94259
       - SCUS-94260
+  metadata:
+    genre: "** DEMO **"
 SCUS-94298:
   name: "PlayStation Underground Volume 2 Issue 4 (USA) (Disc 1)"
   discSet:
@@ -125745,6 +126056,8 @@ SCUS-94298:
     serials:
       - SCUS-94298
       - SCUS-94299
+  metadata:
+    genre: "** DEMO **"
 SCUS-94299:
   name: "PlayStation Underground Volume 2 Issue 4 (USA) (Disc 2)"
   discSet:
@@ -125752,6 +126065,8 @@ SCUS-94299:
     serials:
       - SCUS-94298
       - SCUS-94299
+  metadata:
+    genre: "** DEMO **"
 SCUS-94269:
   name: "PlayStation Underground Volume 2.3 (USA) (Disc 1)"
   discSet:
@@ -125759,6 +126074,8 @@ SCUS-94269:
     serials:
       - SCUS-94269
       - SCUS-94270
+  metadata:
+    genre: "** DEMO **"
 SCUS-94270:
   name: "PlayStation Underground Volume 2.3 (USA) (Disc 2)"
   discSet:
@@ -125766,40 +126083,76 @@ SCUS-94270:
     serials:
       - SCUS-94269
       - SCUS-94270
+  metadata:
+    genre: "** DEMO **"
 SLED-01633:
   name: "PlayStation Zone CD Vol. 1 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02190:
   name: "PlayStation Zone CD Vol. 10 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02275:
   name: "PlayStation Zone CD Vol. 11 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02312:
   name: "PlayStation Zone CD Vol. 12 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02381:
   name: "PlayStation Zone CD Vol. 13 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02436:
   name: "PlayStation Zone CD Vol. 14 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02518:
   name: "PlayStation Zone CD Vol. 15 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02592:
   name: "PlayStation Zone CD Vol. 16 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02683:
   name: "PlayStation Zone CD Vol. 17 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01724:
   name: "PlayStation Zone CD Vol. 2 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01773:
   name: "PlayStation Zone CD Vol. 3 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01783:
   name: "PlayStation Zone CD Vol. 4 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01898:
   name: "PlayStation Zone CD Vol. 5 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01968:
   name: "PlayStation Zone CD Vol. 6 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02042:
   name: "PlayStation Zone CD Vol. 7 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02078:
   name: "PlayStation Zone CD Vol. 8 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02139:
   name: "PlayStation Zone CD Vol. 9 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94193:
   name: "PlayStation-Pepsi Sampler Disc (USA)"
   metadata:
@@ -137588,6 +137941,7 @@ LSP-907127:
   codes:
     - LSP-907127
     - LSP-907127001
+    - 907127001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"