diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index 2e3b7a8cb..c4d7e2b14 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -3882,7 +3882,7 @@ SLES-03743:
     publisher: "Midas Games"
     developer: "Success"
     releaseDate: "2002-04-05"
-    genre: "Sports"
+    genre: "Sports - Air Hockey"
     languages:
       - English
     minPlayers: 1
@@ -3903,7 +3903,7 @@ SLUS-01467:
     publisher: "Mud Duck Productions"
     developer: "Success"
     releaseDate: "2003-09-10"
-    genre: "Sports"
+    genre: "Sports - Air Hockey"
     languages:
       - English
     minPlayers: 1
@@ -4563,7 +4563,7 @@ SLES-03290:
     publisher: "Midas Interactive"
     developer: "Tantalus Interactive"
     releaseDate: "2003-07-02"
-    genre: "Sports"
+    genre: "Sports - Horse 3-Day Eventing"
     languages:
       - English
       - French
@@ -10149,6 +10149,8 @@ SLUS-01090:
     linkCable: false
 SLUS-90027:
   name: "Asciiware Training CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03540:
   name: "Asonde AIUEO (Japan)"
   controllers:
@@ -16645,7 +16647,7 @@ SLUS-01380:
     publisher: "Acclaim Entertainment"
     developer: "Sandbox Studios"
     releaseDate: "2001-05-24"
-    genre: "Sports"
+    genre: "Sports - Lacrosse"
     languages:
       - English
     minPlayers: 1
@@ -20482,7 +20484,7 @@ SLES-03338:
     publisher: "JVC"
     developer: "Metro 3D"
     releaseDate: "2001-02-28"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - English
       - French
@@ -20503,7 +20505,7 @@ SLPS-02792:
     publisher: "Metro"
     developer: "Metro 3D"
     releaseDate: "2000-07-06"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -20522,7 +20524,7 @@ SLUS-01317:
     publisher: "Natsume"
     developer: "Metro 3D"
     releaseDate: "2001-02-28"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - English
     minPlayers: 1
@@ -21812,7 +21814,7 @@ SLES-02950:
     publisher: "Midas Interactive"
     developer: "Theyer GFX"
     releaseDate: "2001-04-13"
-    genre: "Sports"
+    genre: "Sports - Surfing"
     languages:
       - English
       - French
@@ -34988,7 +34990,7 @@ SLES-02740:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2000-10-13"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -35011,7 +35013,7 @@ SLPM-86682:
     publisher: "Acclaim Japan"
     developer: "Z-Axis"
     releaseDate: "2001-02-22"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - Japanese
     minPlayers: 1
@@ -35033,7 +35035,7 @@ SLUS-01026:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2000-09-30"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -35056,7 +35058,7 @@ SLES-03371:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2001-06-30"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -35075,7 +35077,7 @@ SLUS-01347:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2001-05-19"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -49714,7 +49716,7 @@ SLES-02943:
     publisher: "Midas Interactive"
     developer: "Tantalus Interactive"
     releaseDate: "2003-07-02"
-    genre: "Sports"
+    genre: "Sports - Horse 3-Day Eventing"
     languages:
       - English
       - French
@@ -49735,7 +49737,7 @@ SLUS-01462:
     publisher: "Mud Duck Productions"
     developer: "Tantalus Interactive"
     releaseDate: "2003-05-15"
-    genre: "Sports"
+    genre: "Sports - Horse 3-Day Eventing"
     languages:
       - English
       - French
@@ -62996,6 +62998,8 @@ SLUS-00690:
     linkCable: false
 SLUS-80690:
   name: "G. Darius + Devil Dice + Brunswick Circuit Pro Bowling (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00944:
   name: "G.O.D pure (Japan)"
   controllers:
@@ -74031,7 +74035,7 @@ SLPS-00465:
     publisher: "Coconuts Japan"
     developer: "Silicon Dreams"
     releaseDate: "1996-09-27"
-    genre: "Sports"
+    genre: "Sports - Olympics (Summer)"
     languages:
       - Japanese
     minPlayers: 1
@@ -75514,7 +75518,7 @@ SLPM-86002:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-28"
-    genre: "Sports - Olympic"
+    genre: "Sports - Olympics (Summer)"
     languages:
       - Japanese
     minPlayers: 1
@@ -75536,7 +75540,7 @@ SLPM-86056:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-10-29"
-    genre: "Sports - Winter Olympics"
+    genre: "Sports - Olympics (Winter)"
     languages:
       - Japanese
     minPlayers: 1
@@ -79453,7 +79457,7 @@ SLES-03328:
     publisher: "Midas Interactive Entertainment"
     developer: "Theyer GFX"
     releaseDate: "2001-04-12"
-    genre: "Sports"
+    genre: "Racing - Jet Bikes"
     languages:
       - English
       - French
@@ -85940,7 +85944,7 @@ SLPM-86490:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2001-02-15"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -85959,7 +85963,7 @@ SLPM-86381:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1999-12-16"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -85981,7 +85985,7 @@ SLPM-86457:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2001-02-15"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -86003,7 +86007,7 @@ SLPM-86950:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2001-11-22"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -86022,7 +86026,7 @@ SLPM-86628:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2001-02-15"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -98237,7 +98241,7 @@ SLES-03217:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -98256,7 +98260,7 @@ SLES-03218:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - French
     minPlayers: 1
@@ -98275,7 +98279,7 @@ SLES-03219:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - German
     minPlayers: 1
@@ -98294,7 +98298,7 @@ SLPM-87119:
     publisher: "Success"
     developer: "Runecraft"
     releaseDate: "2002-09-05"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - Japanese
     minPlayers: 1
@@ -98313,7 +98317,7 @@ SLUS-01113:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -101170,6 +101174,8 @@ SLES-11734:
     linkCable: false
 SLUS-90035:
   name: "Metal Gear Solid (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLUS-00594:
@@ -111377,7 +111383,7 @@ SLES-00999:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-02-15"
-    genre: "Sports - Winter Olympics"
+    genre: "Sports - Olympics (Winter)"
     languages:
       - English
     minPlayers: 1
@@ -111396,7 +111402,7 @@ SLUS-00591:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-01-15"
-    genre: "Sports - Winter Olympics"
+    genre: "Sports - Olympics (Winter)"
     languages:
       - English
     minPlayers: 1
@@ -117761,7 +117767,7 @@ SLES-00110:
     publisher: "U.S. Gold"
     developer: "Silicon Dreams"
     releaseDate: "1996-07-10"
-    genre: "Sports"
+    genre: "Sports - Olympics (Summer)"
     languages:
       - English
       - French
@@ -117841,7 +117847,7 @@ SLUS-00148:
     publisher: "U.S. Gold"
     developer: "Silicon Dreams"
     releaseDate: "1996-06-18"
-    genre: "Sports"
+    genre: "Sports - Olympics (Summer)"
     languages:
       - English
     minPlayers: 1
@@ -129171,6 +129177,8 @@ SLUS-00639:
     linkCable: false
 SLUS-90039:
   name: "Pro Pinball - Timeshock! (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceSoftwareRenderer # Lots of readbacks.
     - ForceDeinterlacing # Blend results in best-looking pinballs.
@@ -133223,6 +133231,8 @@ SLUS-00005:
     linkCable: false
 SLUS-90001:
   name: "Rayman (USA) (Playable Game Preview)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2108-ga036ae92"
@@ -139420,7 +139430,7 @@ SLES-01080:
     publisher: "Canal+ Multimedia"
     developer: "Canal+ Multimedia"
     releaseDate: "1998-11-16"
-    genre: "Sports"
+    genre: "Sports - Kayaking / Mountain Biking / Snowboarding"
     languages:
       - English
       - French
@@ -139441,7 +139451,7 @@ SLUS-00828:
     publisher: "Electronic Arts"
     developer: "Canal+ Multimedia"
     releaseDate: "1999-03-03"
-    genre: "Sports"
+    genre: "Sports - Kayaking / Mountain Biking / Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -143263,7 +143273,7 @@ SLES-03180:
     publisher: "Ubi Soft Entertaiment"
     developer: "Realtime Associates Inc"
     releaseDate: "2002-01-02"
-    genre: "Sports"
+    genre: "Entertainment - Young Children"
     languages:
       - English
     minPlayers: 1
@@ -143282,7 +143292,7 @@ SLUS-01180:
     publisher: "NewKidCo"
     developer: "Realtime Associates Inc"
     releaseDate: "2001-10-31"
-    genre: "Sports"
+    genre: "Entertainment - Young Children"
     languages:
       - English
     minPlayers: 1
@@ -147788,7 +147798,7 @@ SLPS-02473:
     publisher: "D3 Publisher"
     developer: "Amedio"
     releaseDate: "1999-12-09"
-    genre: "Sports"
+    genre: "Sports - Croquet"
     languages:
       - Japanese
     minPlayers: 1
@@ -149157,7 +149167,7 @@ SLPM-86998:
     publisher: "D3 Publisher"
     developer: "Metro 3D"
     releaseDate: "2001-12-20"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -155302,6 +155312,8 @@ SCPS-45401:
     linkCable: false
 SLUS-90028:
   name: "Squaresoft on PlayStation 1998 Collector's CD Vol. 1 (USA)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
@@ -155341,7 +155353,7 @@ SLUS-90075:
     publisher: "Squaresoft"
     developer: "Squaresoft"
     releaseDate: "2000-05-17"
-    genre: "RPG / Action"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -161684,7 +161696,7 @@ SLPM-86488:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-05-25"
-    genre: "Sports"
+    genre: "Sports - Air Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -161702,7 +161714,7 @@ SLPM-86320:
     publisher: "Success"
     developer: "Coconuts Japan"
     releaseDate: "1999-10-28"
-    genre: "Board"
+    genre: "Pachinko"
     languages:
       - Japanese
     minPlayers: 1
@@ -162739,7 +162751,7 @@ SLPM-86237:
     publisher: "Success"
     developer: "Success"
     releaseDate: "1999-07-01"
-    genre: "Sports"
+    genre: "Sports - Curling"
     languages:
       - Japanese
     minPlayers: 1