diff --git a/beetsplug/lastgenre/genres-tree.yaml b/beetsplug/lastgenre/genres-tree.yaml
index 4a19595bb..6f701f829 100644
--- a/beetsplug/lastgenre/genres-tree.yaml
+++ b/beetsplug/lastgenre/genres-tree.yaml
@@ -1,426 +1,719 @@
-- blues:
-    - african blues
-    - blues rock:
-        - punk blues
-    - country blues
-    - british blues
-    - classic female blues
-    - country blues:
-        - delta blues:
-            - electric blues:
-                - blues rock
-        - east coast blues
-        - hill country blues
-        - jump blues
-        - swamp blues
-        - new orleans blues
-    - dirty blues
-    - fife and drum blues
-    - gospel blues
-    - harmonica blues
-    - indian blues
-    - piano blues:
-        - boogie-woogie:
-            - boogie rock
-    - soul blues
-    - west coast blues
-- country:
-    - alternative country:
-        - americana
-        - blues country
-        - cowpunk
-        - country rock
-        - country folk
-        - country rap:
-            - country crunk:
-                - country psycrunk
-        - deathcountry
-        - gothic americana
-        - hellbilly
-        - nashville sound:
-            - country pop
-        - outlaw country
-        - psychobilly
-        - punkabilly
-        - psydeco
-        - red dirt
-        - rockabilly
-        - rock country
-        - soul country
-        - techno-country
-        - texas country:
-            - progressive country
-    - bakersfield sound
-    - bluegrass:
-        - heavy metal bluegrass
-        - nu-grass
-        - old-time bluegrass
-        - progressive bluegrass
-        - reactionary bluegrass
-    - christian country music
-    - neotraditional country
-    - western music:
-        - honky tonk
-- easy listening:
-    - background music
-    - beautiful music
-    - elevator music
-    - furniture music
-    - lounge music
-- electronic:
-    - ambient:
-        - ambient house
-        - ambient techno
-        - dark ambient
-        - drone music
-        - illbient
-        - isolationism
-        - lowercase
-    - breakbeat:
-        - acid breaks
-        - baltimore club
-        - big beat
-        - breakbeat hardcore
-        - broken beat
-        - florida breaks
-        - nu skool breaks
-        - 4-beat
-    - dance:
-        - eurodance
-        - hi-nrg
-        - house:
-            - acid house
-            - autumn house
-            - chicago house
-            - deep house
-            - diva house
-            - fidget house
-            - french house
-            - freestyle house
-            - funky house
-            - ghetto house
-            - hardbag
-            - hip house
-            - italo house
-            - latin house
-            - minimal house
-            - microhouse
-            - rave music
-            - swing house
-            - tech house
-            - tribal house
-            - uk hard house
-            - us garage
-            - vocal house
-    - electronica:
-        - berlin school
-        - bitpop
-        - chip
-        - chillwave
-        - downtempo:
-            - acid jazz
-            - balearic beat
-            - chill out
-            - dubtronica
-            - ethnic electronica
-            - moombahton
-            - new age music
-            - nu jazz
-            - trip hop
-        - folktronica
-        - glitch
-        - idm
-        - plinkerpop
-    - hardcore techno:
-        - bouncy house
-        - bouncy techno
-        - breakcore
-        - darkcore
-        - digital hardcore
-        - doomcore
-        - gabba
-        - happy hardcore
-        - hardstyle
-        - jumpstyle
-        - makina
-        - speedcore
-        - terrorcore
-        - uk hardcore
-    - jungle:
-        - drum and bass:
-            - clownstep
-            - darkcore
-            - darkstep
-            - drumfunk
-            - drumstep
-            - hardstep
-            - intelligent drum and bass
-            - jump-up
-            - liquid funk
-            - neurofunk
-            - oldschool jungle:
-                - darkside jungle
-                - ragga-jungle
-            - raggacore
-            - sambass
-            - trancestep
-    - progressive:
-        - progressive breaks
-        - progressive drum & bass
-        - progressive house:
-            - disco house
-            - dream house
-            - space house
-        - progressive techno
-    - techno:
-        - acid techno
-        - detroit techno
-        - free tekno
-        - ghettotech
-        - minimal
-        - nortec
-        - rotterdam techno
-        - schranz / hardtechno
-        - symphonic techno
-        - tecno brega
-        - techno-dnb
-        - techstep
-        - toytown techno
-    - trance:
-        - acid trance
-        - classic trance
-        - dream trance
-        - euro-trance
-        - goa trance:
-            - dark psytrance
-            - full on
-            - psyprog
-            - psybient
-            - psybreaks
-        - hard trance
-        - neo-trance
-        - tech trance
-        - uplifting trance:
-            - orchestral uplifting
-        - vocal trance:
-            - nightcore
-    - uk garage:
-        - 2-step
-        - 4x4
-        - bassline
-        - breakstep
-        - dubstep
-        - funky
-        - grime
-        - speed garage
-- folk:
-    - folk punk
-    - indie folk
-    - neofolk
-    - progressive folk
-    - anti-folk
-- hip hop & rap:
-    - hip hop:
-        - alternative hip hop:
-            - jazz rap
-            - abstract hip hop
-        - british hip hop:
-            - grime
-        - political hip hop
-        - turntablism
-        - us hip hop:
-            - east coast hip hop:
-                - conscious rap
-            - midwest hip hop:
-                - ghetto house
-                - ghettotech
-                - horrorcore
-            - southern hip hop:
-                - snap music
-                - bounce music
-                - crunk
-                - chopped and screwed
-            - west coast hip hop:
-                - gangsta rap:
-                    - g-funk
-                - latin rap
-                - g-funk
-                - hyphy
-                - jerkin'
-    - rap:
-        - bass rap
-        - dirty rap
-        - hardcore rap
-        - mafioso rap
-        - party rap
-        - porn rap
-        - rap metal
-        - rap rock
-        - rapcore
-- latin:
-    - bachata
-    - brazilian music:
-        - samba:
-            - bossa nova:
-                - tropicalismo
-    - calypso
-    - chutney:
-        - chutney soca
-    - cuban music:
-        - salsa
-        - son cubano
-    - cumbia
-    - kompa
-    - mambo:
-        - cha-cha-cha
-        - pachanga
-    - merengue
-    - salsa
-    - soca
-    - tejano
-    - zouk
-- pop:
-    - electro pop
-    - new romantic
-    - operatic pop
-    - pop rap
-    - psychedelic pop
-    - sunshine pop
-    - surf pop
-    - synthpop
-    - teen pop
-    - traditional pop music
-    - turkish pop
-    - world:
-        - europop
-        - indian pop
-        - latin pop
-- r&b:
-    - contemporary r&b
-    - doo wop
-    - funk:
-        - deep funk
-        - disco:
-            - eurodisco
-            - disco polo
-            - post disco
-            - space disco
-            - boogie
-        - go-go
-        - nu-funk
-        - p-funk
-    - new jack swing
-    - soul:
-        - blue-eyed soul
-        - brown-eyed soul
-        - hip hop soul
-        - motown sound
-        - neo soul
-        - northern soul
-        - psychedelic soul
-        - smooth soul
-        - quiet storm
-- rock:
-    - alternative rock:
-        - britpop:
-            - post-britpop
-        - dream pop
-        - grunge:
-            - post-grunge
-        - indie pop
-        - indie rock
-        - industrial rock
-        - noise pop
-        - post-rock
-        - shoegazer
-        - slowcore
-    - blues-rock
-    - chinese rock
-    - dark cabaret
-    - desert rock
-    - electronic rock
-    - folk rock
-    - garage rock
-    - glam rock
-    - hard rock
-    - heavy metal:
-        - black metal
-        - christian metal
-        - death metal:
-            - brutal death metal
-            - melodic death metal
-            - technical death metal
-            - progressive death metal
-        - doom metal
-        - drone metal
-        - folk metal
-        - funk metal
-        - glam metal
-        - gothic metal
-        - grindcore
-        - groove metal
-        - industrial metal
-        - metalcore:
-            - deathcore
-            - mathcore
-            - melodic metalcore
-            - djent
-        - nu metal
-        - power metal
-        - progressive metal
-        - rap metal
-        - sludge metal
-        - speed metal
-        - stoner rock
-        - symphonic metal
-        - thrash metal:
-            - crossover thrash metal
-            - thrashcore
-            - weld
-        - unblack metal
-    - jazz-rock
-    - j-rock
-    - math rock
-    - new wave:
-        - world fusion
-    - paisley underground
-    - pop rock
-    - power pop
-    - progressive rock:
-        - new prog
-        - space rock
-    - psychedelic rock:
-        - acid rock
-    - punk rock:
-        - anarcho punk:
-            - crust punk
-        - deathrock
-        - hardcore punk:
-            - post-hardcore
-            - emo:
-                - screamo
-        - pop punk
-        - post-punk:
-            - gothic rock
-        - psychobilly
-    - rap rock:
-        - rapcore
-    - rock and roll
-    - soft rock
-    - southern rock
-    - surf rock
-- ska:
-    - 2 tone
-    - reggae:
-        - early reggae
-        - dub:
-            - dub poetry
-            - afro-dub
-        - rockers
-        - lovers rock
-        - dancehall:
-            - ragga
-            - reggaeton
-        - raggamuffin
-        - roots reggae
-    - rocksteady
+- african:
+    - african heavy metal
+    - african hip hop
+    - afrobeat
+    - apala
+    - benga
+    - bikutsi
+    - bongo flava
+    - cape jazz
+    - chimurenga
+    - coupé-décalé
+    - fuji music
+    - genge
+    - highlife
+    - hiplife
+    - isicathamiya
+    - jit
+    - jùjú
+    - kapuka
+    - kizomba
+    - kuduro
+    - kwaito
+    - kwela
+    - makossa
+    - maloya
+    - marrabenta
+    - mbalax
+    - mbaqanga
+    - mbube
+    - morna
+    - museve
+    - palm-wine
+    - raï
+    - sakara
+    - sega
+    - seggae
+    - semba
+    - soukous
+    - taarab
+    - zouglou
+- asian:
+    - east asian:
+        - anison
+        - c-pop
+        - cantopop
+        - enka
+        - hong kong english pop
+        - j-pop
+        - k-pop
+        - kayōkyoku
+        - korean pop
+        - mandopop
+        - onkyokei
+        - taiwanese pop
+    - fann at-tanbura
+    - fijiri
+    - khaliji
+    - liwa
+    - sawt
+    - south and southeast asian:
+        - baila
+        - bhangra
+        - bhojpuri
+        - dangdut
+        - filmi
+        - indian pop
+        - lavani
+        - luk thung:
+            - luk krung
+        - manila sound
+        - morlam
+        - pinoy pop
+        - pop sunda
+        - ragini
+        - thai pop
+- avant-garde:
+    - experimental music
+    - lo-fi
+    - musique concrète
+- blues:
+    - african blues
+    - blues rock
+    - blues shouter
+    - british blues
+    - canadian blues
+    - chicago blues
+    - classic female blues
+    - contemporary r&b
+    - country blues
+    - delta blues
+    - detroit blues
+    - electric blues
+    - gospel blues
+    - hill country blues
+    - hokum blues
+    - jazz blues
+    - jump blues
+    - kansas city blues
+    - louisiana blues
+    - memphis blues
+    - piano blues
+    - piedmont blues
+    - punk blues
+    - soul blues
+    - st. louis blues
+    - swamp blues
+    - texas blues
+    - west coast blues
+- caribbean and latin american:
+    - bachata
+    - baithak gana
+    - bolero
+    - brazilian:
+        - axé
+        - bossa nova
+        - brazilian rock
+        - brega
+        - choro
+        - forró
+        - frevo
+        - funk carioca
+        - lambada
+        - maracatu
+        - música popular brasileira
+        - música sertaneja
+        - pagode
+        - samba
+        - samba rock
+        - tecnobrega
+        - tropicalia
+        - zouk-lambada
+    - calypso
+    - chutney
+    - chutney soca
+    - compas
+    - dance hall
+    - mambo
+    - merengue
+    - méringue
+    - other latin:
+        - chicha
+        - criolla
+        - cumbia
+        - huayno
+        - mariachi
+        - ranchera
+        - tejano
+    - punta
+    - punta rock
+    - rasin
+    - reggae
+    - reggaeton
+    - salsa
+    - soca
+    - son
+    - timba
+    - twoubadou
+    - zouk
+- comedy:
+    - comedy music
+    - comedy rock
+    - parody music
+- country:
+    - alternative country:
+        - cowpunk
+    - americana
+    - australian country music
+    - bakersfield sound
+    - bluegrass:
+        - progressive bluegrass
+        - reactionary bluegrass
+    - blues country
+    - cajun:
+        - cajun fiddle tunes
+    - christian country music
+    - classic country
+    - close harmony
+    - country pop
+    - country rap
+    - country rock
+    - country soul
+    - cowboy/western music
+    - dansband music
+    - franco-country
+    - gulf and western
+    - hellbilly music
+    - hokum
+    - honky tonk
+    - instrumental country
+    - lubbock sound
+    - nashville sound
+    - neotraditional country
+    - outlaw country
+    - progressive country
+    - psychobilly/punkabilly
+    - red dirt
+    - rockabilly
+    - sertanejo
+    - texas country
+    - traditional country music
+    - truck-driving country
+    - western swing
+    - zydeco
+- easy listening:
+    - background music
+    - beautiful music
+    - elevator music
+    - furniture music
+    - lounge music
+    - middle of the road
+    - new-age music
+- electronic:
+    - ambient:
+        - ambient dub
+        - ambient house
+        - ambient techno
+        - dark ambient
+        - drone music
+        - illbient
+        - isolationism
+        - lowercase
+    - asian underground
+    - breakbeat:
+        - 4-beat
+        - acid breaks
+        - baltimore club
+        - big beat
+        - breakbeat hardcore
+        - broken beat
+        - florida breaks
+        - nu skool breaks
+    - chiptune:
+        - bitpop
+        - game boy music
+        - nintendocore
+        - video game music
+        - yorkshire bleeps and bass
+    - disco:
+        - cosmic disco
+        - disco polo
+            - euro disco
+        - italo disco
+        - nu-disco
+        - space disco
+    - downtempo:
+        - acid jazz
+        - balearic beat
+        - chill out
+        - dub music
+        - dubtronica
+        - ethnic electronica
+        - moombahton
+        - nu jazz
+        - trip hop
+    - drum and bass:
+        - darkcore
+        - darkstep
+        - drumfunk
+        - drumstep
+        - hardstep
+        - intelligent drum and bass
+        - jump-up
+        - liquid funk
+        - neurofunk
+        - oldschool jungle:
+            - darkside jungle
+            - ragga-jungle
+        - raggacore
+        - sambass
+        - techstep
+    - electro:
+        - crunk
+        - electro backbeat
+        - electro-grime
+        - electropop
+    - electroacoustic:
+        - acousmatic music
+        - computer music
+        - electroacoustic improvisation
+        - field recording
+        - live coding
+        - live electronics
+        - soundscape composition
+        - tape music
+    - electronic rock:
+        - alternative dance:
+            - baggy
+            - madchester
+        - dance-punk
+        - dance-rock
+        - dark wave
+        - electroclash
+        - electronicore
+        - electropunk
+        - ethereal wave
+        - indietronica
+        - new rave
+        - space rock
+        - synthpop
+        - synthpunk
+    - electronica:
+        - berlin school
+        - chillwave
+        - electronic art music
+        - electronic dance music
+        - folktronica
+        - freestyle music
+        - glitch
+        - idm
+        - laptronica
+        - skweee
+        - sound art
+        - synthcore
+    - eurodance:
+        - bubblegum dance
+        - italo dance
+        - turbofolk
+    - hardcore:
+        - bouncy house
+        - bouncy techno
+        - breakcore
+        - digital hardcore
+        - doomcore
+        - dubstyle
+        - gabber
+        - happy hardcore
+        - hardstyle
+        - jumpstyle
+        - makina
+        - speedcore
+        - terrorcore
+        - uk hardcore
+    - hi-nrg:
+        - eurobeat
+        - hard nrg
+        - new beat
+    - house:
+        - acid house
+        - chicago house
+        - deep house
+        - diva house
+        - dutch house
+        - electro house
+        - freestyle house
+        - french house
+        - funky house
+        - ghetto house
+        - hardbag
+        - hip house
+        - italo house
+        - latin house
+        - minimal house
+        - progressive house
+        - rave music
+        - swing house
+        - tech house
+        - tribal house
+        - uk hard house
+        - us garage
+        - vocal house
+    - industrial:
+        - aggrotech
+        - coldwave
+        - cybergrind
+        - dark electro
+        - death industrial
+        - electro-industrial
+        - electronic body music:
+            - futurepop
+        - industrial metal:
+            - neue deutsche härte
+        - industrial rock
+        - noise:
+            - japanoise
+            - power electronics
+            - power noise
+        - witch house
+    - post-disco:
+        - boogie
+        - dance-pop
+    - progressive:
+        - progressive house/trance:
+            - disco house
+            - dream house
+            - space house
+        - progressive breaks
+        - progressive drum & bass
+        - progressive techno
+    - techno:
+        - acid techno
+        - detroit techno
+        - free tekno
+        - ghettotech
+        - minimal
+        - nortec
+        - schranz
+        - techno-dnb
+        - technopop
+        - tecno brega
+        - toytown techno
+    - trance:
+        - acid trance
+        - classic trance
+        - dream trance
+        - goa trance:
+            - dark psytrance
+            - full on
+            - psybreaks
+            - psyprog
+            - suomisaundi
+        - hard trance
+        - tech trance
+        - uplifting trance:
+            - orchestral uplifting
+        - vocal trance
+    - uk garage:
+        - 2-step
+        - 4x4
+        - bassline
+        - breakstep
+        - dubstep
+        - funky
+        - grime
+        - speed garage
+        - trap
+- folk:
+    - american folk revival
+    - anti-folk
+    - british folk revival
+    - celtic music
+    - contemporary folk
+    - filk music
+    - freak folk
+    - indie folk
+    - industrial folk
+    - neofolk
+    - progressive folk
+    - psychedelic folk
+    - sung poetry
+    - techno-folk
+- hip hop:
+    - alternative hip hop
+    - avant-garde hip hop
+    - chap hop
+    - christian hip hop
+    - conscious hip hop
+    - country-rap
+    - crunkcore
+    - cumbia rap
+    - east coast hip hop:
+        - brick city club
+        - hardcore hip hop
+        - mafioso rap
+        - new jersey hip hop
+    - electro music
+    - freestyle rap
+    - g-funk
+    - gangsta rap
+    - golden age hip hop
+    - hip hop soul
+    - hip pop
+    - hyphy
+    - industrial hip hop
+    - instrumental hip hop
+    - jazz rap
+    - low bap
+    - lyrical hip hop
+    - merenrap
+    - midwest hip hop:
+        - chicago hip hop:
+        - detroit hip hop:
+        - horrorcore
+        - st. louis hip hop
+        - twin cities hip hop
+    - motswako
+    - nerdcore
+    - new jack swing
+    - new school hip hop
+    - old school hip hop
+    - political hip hop
+    - ragga
+    - rap opera
+    - rap rock:
+        - rap metal
+        - rapcore
+    - reggae español/spanish reggae
+    - songo-salsa
+    - southern hip hop:
+        - atlanta hip hop:
+            - snap music
+        - bounce music
+        - houston hip hop:
+            - chopped and screwed
+        - miami bass
+    - turntablism
+    - underground hip hop
+    - urban pasifika
+    - west coast hip hop:
+        - chicano rap
+        - jerkin'
+- jazz:
+    - asian american jazz
+    - avant-garde jazz
+    - bebop
+    - boogie-woogie
+    - british dance band
+    - chamber jazz
+    - continental jazz
+    - cool jazz
+    - crossover jazz
+    - cubop
+    - dixieland
+    - ethno jazz
+    - european free jazz
+    - free funk
+    - free improvisation
+    - free jazz
+    - gypsy jazz
+    - hard bop
+    - jazz fusion
+    - jazz rock
+    - jazz-funk
+    - kansas city jazz
+    - latin jazz
+    - livetronica
+    - m-base
+    - mainstream jazz
+    - modal jazz
+    - neo-bop jazz
+    - neo-swing
+    - novelty ragtime
+    - orchestral jazz
+    - post-bop
+    - punk jazz
+    - ragtime
+    - shibuya-kei
+    - ska jazz
+    - smooth jazz
+    - soul jazz
+    - straight-ahead jazz
+    - stride jazz
+    - swing
+    - third stream
+    - trad jazz
+    - vocal jazz
+    - west coast gypsy jazz
+    - west coast jazz
+- other:
+    - worldbeat
+- pop:
+    - adult contemporary
+    - arab pop
+    - baroque pop
+    - bubblegum pop
+    - chanson
+    - christian pop
+    - classical crossover
+    - europop:
+        - austropop
+        - balkan pop
+        - french pop
+        - latin pop
+        - laïkó
+        - nederpop
+        - russian pop
+    - iranian pop
+    - jangle pop
+    - latin ballad
+    - levenslied
+    - louisiana swamp pop
+    - mexican pop
+    - motorpop
+    - new romanticism
+    - pop rap
+    - popera
+    - psychedelic pop
+    - schlager
+    - soft rock
+    - sophisti-pop
+    - space age pop
+    - sunshine pop
+    - surf pop
+    - teen pop
+    - traditional pop music
+    - turkish pop
+    - vispop
+    - wonky pop
+- rhythm and blues:
+    - funk:
+        - deep funk
+        - go-go
+        - p-funk
+    - soul:
+        - blue-eyed soul
+        - neo soul
+        - northern soul
+- rock:
+    - alternative rock:
+        - britpop:
+            - post-britpop
+        - dream pop
+        - grunge:
+            - post-grunge
+        - indie pop:
+            - dunedin sound
+            - twee pop
+        - indie rock
+        - noise pop
+        - nu metal
+        - post-punk revival
+        - post-rock:
+            - post-metal
+        - sadcore
+        - shoegaze
+        - slowcore
+    - art rock
+    - beat music
+    - chinese rock
+    - christian rock
+    - dark cabaret
+    - desert rock
+    - experimental rock
+    - folk rock
+    - garage rock
+    - glam rock
+    - hard rock
+    - heavy metal:
+        - alternative metal:
+        - black metal:
+            - viking metal
+        - christian metal
+        - death metal:
+            - goregrind
+            - melodic death metal
+            - technical death metal
+        - doom metal
+        - drone metal
+        - folk metal:
+            - celtic metal
+            - medieval metal
+        - funk metal
+        - glam metal
+        - gothic metal
+        - metalcore:
+            - deathcore
+            - mathcore:
+                - djent
+        - power metal
+        - progressive metal
+        - sludge metal
+        - speed metal
+        - stoner rock
+        - symphonic metal
+        - thrash metal:
+            - crossover thrash
+            - groove metal
+    - math rock
+    - new wave:
+        - world fusion
+    - paisley underground
+    - pop rock
+    - post-punk:
+        - gothic rock
+        - no wave
+        - noise rock
+    - power pop
+    - progressive rock:
+        - canterbury scene
+        - krautrock
+        - new prog
+        - rock in opposition
+    - psychedelic rock:
+        - acid rock
+        - freakbeat
+        - neo-psychedelia
+        - raga rock
+    - punk rock:
+        - anarcho punk:
+            - crust punk:
+                - d-beat
+        - art punk
+        - christian punk
+        - deathrock
+        - folk punk:
+            - celtic punk
+            - gypsy punk
+        - garage punk
+        - grindcore:
+            - crustgrind
+            - noisegrind
+        - hardcore punk:
+            - post-hardcore:
+                - emo:
+                    - screamo
+            - powerviolence
+            - street punk
+            - thrashcore
+        - horror punk
+        - pop punk
+        - psychobilly
+        - riot grrrl
+        - ska punk:
+            - ska-core
+        - skate punk
+    - rock and roll
+    - southern rock
+    - sufi rock
+    - surf rock
+    - visual kei:
+        - nagoya kei
+- ska:
+    - 2 tone
+    - dancehall
+    - dub
+    - lovers rock
+    - ragga jungle
+        - polish reggae
+    - reggae fusion
+    - rocksteady
diff --git a/test/test_lastgenre.py b/test/test_lastgenre.py
index 74ef402c7..62f20491b 100644
--- a/test/test_lastgenre.py
+++ b/test/test_lastgenre.py
@@ -70,7 +70,7 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper):
         """
         self._setup_config(canonical=True, whitelist=True, count=99)
         self.assertEqual(self.plugin._resolve_genres(['delta blues']),
-                         'Delta Blues, Country Blues, Blues')
+                         'Delta Blues, Blues')
 
     def test_whitelist_custom(self):
         """Keep only genres that are in the whitelist.