diff --git a/osm2vectortiles.tm2source/data.yml b/osm2vectortiles.tm2source/data.yml
index b3d53cb..30490ca 100644
--- a/osm2vectortiles.tm2source/data.yml
+++ b/osm2vectortiles.tm2source/data.yml
@@ -792,7 +792,7 @@ Layer:
               coalesce(NULLIF(name_zh, ''), name) AS name_zh,
               format_type(type) AS type,
               poi_label_scalerank(type, area) AS scalerank,
-              coalesce(maki_label_class(type), 'marker') AS maki,
+              coalesce(NULLIF(maki_label_class(type), ''), 'marker') AS maki,
               rank() OVER (PARTITION BY LabelGrid(geometry, 128 * !pixel_width!)
                            ORDER BY poi_label_localrank(type) ASC) AS localrank
             FROM poi_label_z14
diff --git a/src/import-osm/mapping.yml b/src/import-osm/mapping.yml
index 79894b7..75c2d12 100644
--- a/src/import-osm/mapping.yml
+++ b/src/import-osm/mapping.yml
@@ -886,6 +886,7 @@ tables:
       - taxi
       - bus_station
       - marketplace
+      - toilets
       leisure:
       - park
       - playground
@@ -905,6 +906,7 @@ tables:
       - cemetery
       - basin
       - reservoir
+      - brownfield
       sport:
       - swimming
       - tennis
@@ -1001,6 +1003,8 @@ tables:
       - viewpoint
       - zoo
       - theme_park
+      - information
+      - picnic_site
       shop:
       - accessories
       - alcohol
@@ -1189,6 +1193,7 @@ tables:
       - taxi
       - bus_station
       - marketplace
+      - toilets
       leisure:
       - park
       - playground
@@ -1208,6 +1213,7 @@ tables:
       - cemetery
       - basin
       - reservoir
+      - brownfield
       sport:
       - swimming
       - tennis
@@ -1304,6 +1310,8 @@ tables:
       - viewpoint
       - zoo
       - theme_park
+      - information
+      - picnic_site
       shop:
       - accessories
       - alcohol
diff --git a/src/import-sql/classes/maki_label.yml b/src/import-sql/classes/maki_label.yml
index 33e8cdf..d3dec17 100644
--- a/src/import-sql/classes/maki_label.yml
+++ b/src/import-sql/classes/maki_label.yml
@@ -1,8 +1,8 @@
 system:
   name: maki_label
   classes:
-    american-football:
-    - american_football
+    airfield:
+    - station
     art-gallery:
     - accessories
     - antiques
@@ -14,23 +14,10 @@ system:
     - alcohol
     - beverages
     - wine
-    amenity:
-    - courthouse
-    - community_centre
-    - nursing_home
-    - veterinary
-    - nightclub
-    - recycling
-    - food_court
-    barrier:
-    - sally_port
-    - lift_gate
-    - gate
-    - bollard
-    - stile
-    - cycle_barrier
-    - toll_booth
-    - border_control
+    attraction:
+    - attraction
+    amusement-park:
+    - theme_park
     bakery:
     - bakery
     bank:
@@ -40,22 +27,18 @@ system:
     beer:
     - biergarten
     - pub
-    baseball:
-    - baseball
-    basketball:
-    - basketball
-    building:
-    - public_building
     bus:
     - bus_stop
     - bus_station
     bicycle:
     - bicycle
+    bicycle-share:
     - bicycle_rental
     cafe:
     - cafe
     campsite:
     - camp_site
+    - caravan_site
     car:
     - car
     - car_repair
@@ -75,6 +58,7 @@ system:
     - cricket
     dentist:
     - dentist
+    doctor:
     - doctor
     dog-park:
     - dog_park
@@ -86,14 +70,13 @@ system:
     - ferry_terminal
     fast-food:
     - fast_food
+    - food_court
     fire-station:
     - fire_station
     fuel:
     - fuel
     garden:
     - garden
-    gift:
-    - gift
     golf:
     - golf
     - golf_course
@@ -105,97 +88,19 @@ system:
     - department_store
     - greengrocer
     - marketplace
-    sport:
-    - multi
-    - equestrian
-    - athletics
-    - volleyball
-    - climbing
-    - bowls
-    - skateboard
-    - shooting
-    - skiing
-    - boules
-    - beachvolleyball
-    - cricket
-    - table_tennis
-    - hockey
-    - gymnastics
-    - running
-    - canoe
-    - rugby_union
-    - skating
-    - scuba_diving
-    - motor
-    - horse_racing
-    - handball
-    - team_handball
-    - karting
-    - cycling
-    - archery
-    - motocross
-    - pelota
-    - rugby
-    - gaelic_games
-    - model_aerodrome
-    - netball
-    - rugby_league
-    - free_flying
-    - rowing
-    - chess
-    - australian_football
-    - cricket_nets
-    - racquet
-    - bmx
-    - sailing
-    - ice_stock
-    - badminton
-    - paddle_tennis
-    - dog_racing
-    - fatsal
-    - billiards
-    - ice_hockey
-    - yoga
-    - disc_golf
-    - orienteering
-    - toboggan
-    - horseshoes
-    - paragliding
-    - korfball
-    - diving
-    - rc_car
-    - canadian_football
-    - field_hockey
-    - shooting_range
-    - boxing
-    - curling
-    - surfing
-    - water_ski
-    - judo
-    - croquet
-    - paintball
-    - climbing_adventure
-    - long_jump
-    - table_soccer
-    tourism:
-    - attraction
-    - caravan_site
-    - theme_park
-    hairdresser:
-    - hairdresser
     heliport:
     - helipad
     hospital:
     - hospital
-    highway:
-    - motorway_junction
-    - turning_circle
+    - nursing_home
     harbor:
     - marina
     - dock
     ice-cream:
     - chocolate
     - confectionery
+    information:
+    - information
     laundry:
     - laundry
     - dry_cleaning
@@ -211,13 +116,6 @@ system:
     - chalet
     - alpine_hut
     - camp_site
-    leisure:
-    - sports_centre
-    - water_park
-    - stadium
-    - ice_rink
-    mobilephone:
-    - mobile_phone
     monument:
     - monument
     museum:
@@ -231,8 +129,8 @@ system:
     - bbq
     pharmacy:
     - pharmacy
-    pitch:
-    - pitch
+    picnic-site:
+    - picnic-site
     place-of-worship:
     - place_of_worship
     playground:
@@ -309,24 +207,23 @@ system:
     - watches
     - weapons
     - wholesale
-    aerialway:
-    - station
+    stadium:
+    - american_football
+    - stadium
+    - soccer
+    - pitch
     slaughterhouse:
     - butcher
-    soccer:
-    - soccer
     swimming:
     - swimming_area
     - swimming
-    telephone:
-    - telephone
-    tennis:
-    - tennis
     theater:
     - theater
+    toilet:
+    - toilets
     town-hall:
     - townhall
-    waste-basket:
-    - waste_basket
+    veterinary:
+    - veterinary
     zoo:
     - zoo