diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index 2e3b7a8cb..f924b7742 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -1067,7 +1067,7 @@ SLPS-01434:
   controllers:
     - DigitalController
   traits:
-    - ForceDeinterlacing
+    - ForceInterlacing
   metadata:
     publisher: "ASCII Entertaiment"
     developer: "ASCII Entertaiment"
@@ -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
@@ -8583,10 +8583,13 @@ SLUS-00952:
   compatibility:
     rating: NoIssues
     versionTested: "0.1-2433-g9089c973"
+    comments: "Not sure if the graphical errors in \"720\" aren't present in real hardware. If isn't, please report then we can reopen the (Issues #700)."
   controllers:
     - AnalogController
     - DigitalController
     - PlayStationMouse
+  traits:
+    - ForceInterlacing
   metadata:
     publisher: "Midway Home Entertainment"
     developer: "Digital Eclipse Software, Inc"
@@ -10149,6 +10152,8 @@ SLUS-01090:
     linkCable: false
 SLUS-90027:
   name: "Asciiware Training CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03540:
   name: "Asonde AIUEO (Japan)"
   controllers:
@@ -16645,7 +16650,7 @@ SLUS-01380:
     publisher: "Acclaim Entertainment"
     developer: "Sandbox Studios"
     releaseDate: "2001-05-24"
-    genre: "Sports"
+    genre: "Sports - Lacrosse"
     languages:
       - English
     minPlayers: 1
@@ -20482,7 +20487,7 @@ SLES-03338:
     publisher: "JVC"
     developer: "Metro 3D"
     releaseDate: "2001-02-28"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - English
       - French
@@ -20503,7 +20508,7 @@ SLPS-02792:
     publisher: "Metro"
     developer: "Metro 3D"
     releaseDate: "2000-07-06"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -20522,7 +20527,7 @@ SLUS-01317:
     publisher: "Natsume"
     developer: "Metro 3D"
     releaseDate: "2001-02-28"
-    genre: "Sports"
+    genre: "Sports - Wake Boarding"
     languages:
       - English
     minPlayers: 1
@@ -21812,7 +21817,7 @@ SLES-02950:
     publisher: "Midas Interactive"
     developer: "Theyer GFX"
     releaseDate: "2001-04-13"
-    genre: "Sports"
+    genre: "Sports - Surfing"
     languages:
       - English
       - French
@@ -34988,7 +34993,7 @@ SLES-02740:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2000-10-13"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -35011,7 +35016,7 @@ SLPM-86682:
     publisher: "Acclaim Japan"
     developer: "Z-Axis"
     releaseDate: "2001-02-22"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - Japanese
     minPlayers: 1
@@ -35033,7 +35038,7 @@ SLUS-01026:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2000-09-30"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -35056,7 +35061,7 @@ SLES-03371:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2001-06-30"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -35075,7 +35080,7 @@ SLUS-01347:
     publisher: "Acclaim"
     developer: "Z-Axis"
     releaseDate: "2001-05-19"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -37082,10 +37087,13 @@ SLUS-00912:
   name: "Destruction Derby Raw (USA)"
   compatibility:
     rating: NoIssues
+    upscalingIssues: "Menu images and car previews don't show properly"
   controllers:
     - AnalogController
     - DigitalController
     - NeGcon
+  traits:
+    - ForceInterlacing
   metadata:
     publisher: "Psygnosis"
     developer: "Studio 33 Ltd"
@@ -37251,7 +37259,7 @@ SCES-01312:
     - AnalogController
     - DigitalController
   traits:
-    - ForceDeinterlacing
+    - ForceInterlacing
   metadata:
     publisher: "THQ"
     developer: "Shift"
@@ -49714,7 +49722,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 +49743,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 +63004,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 +74041,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 +75524,7 @@ SLPM-86002:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-28"
-    genre: "Sports - Olympic"
+    genre: "Sports - Olympics (Summer)"
     languages:
       - Japanese
     minPlayers: 1
@@ -75536,7 +75546,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 +79463,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 +85950,7 @@ SLPM-86490:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2001-02-15"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -85959,7 +85969,7 @@ SLPM-86381:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1999-12-16"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -85981,7 +85991,7 @@ SLPM-86457:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2001-02-15"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -86003,7 +86013,7 @@ SLPM-86950:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2001-11-22"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -86022,7 +86032,7 @@ SLPM-86628:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2001-02-15"
-    genre: "Sports"
+    genre: "TV Game Show"
     languages:
       - Japanese
     minPlayers: 1
@@ -98237,7 +98247,7 @@ SLES-03217:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -98256,7 +98266,7 @@ SLES-03218:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - French
     minPlayers: 1
@@ -98275,7 +98285,7 @@ SLES-03219:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - German
     minPlayers: 1
@@ -98294,7 +98304,7 @@ SLPM-87119:
     publisher: "Success"
     developer: "Runecraft"
     releaseDate: "2002-09-05"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - Japanese
     minPlayers: 1
@@ -98313,7 +98323,7 @@ SLUS-01113:
     publisher: "Activision"
     developer: "Runecraft"
     releaseDate: "2001-05-16"
-    genre: "Sports"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -101170,6 +101180,8 @@ SLES-11734:
     linkCable: false
 SLUS-90035:
   name: "Metal Gear Solid (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLUS-00594:
@@ -106246,10 +106258,13 @@ SLPS-03336:
   name: "Mr. Driller G (Japan)"
   compatibility:
     rating: NoIssues
+    comments: "Flickering results panel and sprites after a Game Over screen."
   controllers:
     - AnalogController
     - DigitalController
     - NeGcon
+  traits:
+    - ForceInterlacing
   metadata:
     publisher: "Namco"
     developer: "Namco"
@@ -111377,7 +111392,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 +111411,7 @@ SLUS-00591:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-01-15"
-    genre: "Sports - Winter Olympics"
+    genre: "Sports - Olympics (Winter)"
     languages:
       - English
     minPlayers: 1
@@ -112185,6 +112200,8 @@ SLPS-03553:
   controllers:
     - AnalogController
     - DigitalController
+  traits:
+    - ForceInterlacing
   metadata:
     publisher: "Bandai"
     developer: "Denyusha & Dimps"
@@ -117761,7 +117778,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 +117858,7 @@ SLUS-00148:
     publisher: "U.S. Gold"
     developer: "Silicon Dreams"
     releaseDate: "1996-06-18"
-    genre: "Sports"
+    genre: "Sports - Olympics (Summer)"
     languages:
       - English
     minPlayers: 1
@@ -126964,7 +126981,6 @@ SCPS-45379:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "KCE Yokohama"
@@ -126984,7 +127000,6 @@ SLPM-86183:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "KCE Yokohama"
@@ -127004,7 +127019,6 @@ SLPM-86592:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "KCE Studios"
@@ -127024,7 +127038,6 @@ SLPM-86670:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "Konami"
@@ -127044,7 +127057,6 @@ SCPS-45433:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "Konami"
@@ -127064,7 +127076,6 @@ SLPM-86294:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   codes:
     - SLPM-86294
     - SLPM-86512
@@ -127087,7 +127098,6 @@ SLPM-86415:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "Konami"
@@ -127107,7 +127117,6 @@ SLPM-86649:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "Konami"
@@ -127127,7 +127136,6 @@ SLPM-86937:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Konami"
     developer: "Konami"
@@ -127147,7 +127155,8 @@ SLPM-87089:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
+  traits:
+    - ForceInterlacing
   metadata:
     publisher: "Konami"
     developer: "Konami"
@@ -127167,7 +127176,6 @@ SLPS-01636:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Taito Corporation"
     developer: "Taito"
@@ -127190,7 +127198,6 @@ SLPM-86146:
   controllers:
     - AnalogController
     - DigitalController
-    - PopnController
   metadata:
     publisher: "Enix"
     developer: "Symbio / Roman-Tech"
@@ -129009,8 +129016,8 @@ SLES-01211:
     - AnalogController
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Empire Interactive"
     developer: "Cunning Developments"
@@ -129036,8 +129043,8 @@ SLUS-01260:
     - AnalogController
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Empire Interactive"
     developer: "Cunning Developments"
@@ -129058,8 +129065,8 @@ SLES-02466:
     - AnalogController
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Empire Interactive"
     developer: "Cunning Developments"
@@ -129086,8 +129093,8 @@ SLUS-01261:
     - AnalogController
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Take 2 Interactive / Empire Interactive"
     developer: "Cunning Developments"
@@ -129107,8 +129114,8 @@ SLES-00259:
   controllers:
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Empire Interactive / Interplay"
     developer: "Cunning Developments"
@@ -129128,8 +129135,8 @@ SLES-00606:
   controllers:
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Empire Interactive"
     developer: "Cunning Developments"
@@ -129153,8 +129160,8 @@ SLUS-00639:
   controllers:
     - DigitalController
   traits:
-    - ForceSoftwareRenderer # Lots of readbacks.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
   metadata:
     publisher: "Empire Interactive"
     developer: "Cunning Developments"
@@ -129171,9 +129178,11 @@ 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.
+    - ForceSoftwareRenderer
+    - ForceInterlacing
 SLES-03962:
   name: "Pro Racer (Europe)"
   controllers:
@@ -132752,6 +132761,7 @@ SLUS-00656:
     - AnalogController
     - DigitalController
   traits:
+    - ForceInterlacing
     - ForcePGXPCPUMode # Fixes affine texture mapping on floor.
   metadata:
     publisher: "Mindscape"
@@ -133223,6 +133233,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 +139432,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 +139453,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 +143275,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 +143294,7 @@ SLUS-01180:
     publisher: "NewKidCo"
     developer: "Realtime Associates Inc"
     releaseDate: "2001-10-31"
-    genre: "Sports"
+    genre: "Entertainment - Young Children"
     languages:
       - English
     minPlayers: 1
@@ -145540,7 +145552,7 @@ SLPM-86750:
     - AnalogController
     - DigitalController
   traits:
-    - ForceDeinterlacing
+    - ForceInterlacing
   codes:
     - SLPM-86750
     - SLPS-02120
@@ -147788,7 +147800,7 @@ SLPS-02473:
     publisher: "D3 Publisher"
     developer: "Amedio"
     releaseDate: "1999-12-09"
-    genre: "Sports"
+    genre: "Sports - Croquet"
     languages:
       - Japanese
     minPlayers: 1
@@ -149157,7 +149169,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 +155314,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 +155355,7 @@ SLUS-90075:
     publisher: "Squaresoft"
     developer: "Squaresoft"
     releaseDate: "2000-05-17"
-    genre: "RPG / Action"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -161684,7 +161698,7 @@ SLPM-86488:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-05-25"
-    genre: "Sports"
+    genre: "Sports - Air Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -161702,7 +161716,7 @@ SLPM-86320:
     publisher: "Success"
     developer: "Coconuts Japan"
     releaseDate: "1999-10-28"
-    genre: "Board"
+    genre: "Pachinko"
     languages:
       - Japanese
     minPlayers: 1
@@ -162739,7 +162753,7 @@ SLPM-86237:
     publisher: "Success"
     developer: "Success"
     releaseDate: "1999-07-01"
-    genre: "Sports"
+    genre: "Sports - Curling"
     languages:
       - Japanese
     minPlayers: 1
@@ -169981,7 +169995,7 @@ SLPS-01211:
   controllers:
     - DigitalController
   traits:
-    - ForceDeinterlacing
+    - ForceInterlacing
   metadata:
     publisher: "Banpresto"
     developer: "Banpresto"
@@ -176118,11 +176132,12 @@ SLUS-00337:
   compatibility:
     rating: NoIssues
     versionTested: "0.1-986-gfc911de1"
+    upscalingIssues: "Rendering breaks when upscaling is used."
   controllers:
     - DigitalController
   traits:
-    - DisableUpscaling # Rendering breaks with upscaling.
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
+    - ForceInterlacing
+    - DisableUpscaling
   metadata:
     publisher: "Ocean"
     developer: "Digital Illusions CE AB"
@@ -187588,10 +187603,10 @@ SLES-00483:
     - AnalogController
     - DigitalController
   traits:
+    - ForceInterlacing
     - DisableUpscaling
     - DisablePGXP
     - DisableTextureFiltering
-    - ForceDeinterlacing # Blend results in best-looking pinballs.
   metadata:
     publisher: "Infogrames"
     developer: "Team 17"