diff --git a/data/presets.yaml b/data/presets.yaml
index b4cac2390..bf7b377b0 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2600,7 +2600,7 @@ en:
       aerialway/cable_car:
         # aerialway=cable_car
         name: Cable Car
-        # 'terms: ropeway,tramway'
+        # 'terms: tramway,ropeway'
         terms: '<translate with synonyms or related terms for ''Cable Car'', separated by commas>'
       aerialway/chair_lift:
         # aerialway=chair_lift
@@ -2643,7 +2643,7 @@ en:
       aerialway/rope_tow:
         # aerialway=rope_tow
         name: Rope Tow Lift
-        # 'terms: bugel lift,handle tow'
+        # 'terms: handle tow,bugel lift'
         terms: '<translate with synonyms or related terms for ''Rope Tow Lift'', separated by commas>'
       aerialway/station:
         # aerialway=station
@@ -2709,7 +2709,7 @@ en:
       aeroway/terminal:
         # aeroway=terminal
         name: Airport Terminal
-        # 'terms: aerodrome,airport'
+        # 'terms: airport,aerodrome'
         terms: '<translate with synonyms or related terms for ''Airport Terminal'', separated by commas>'
       aeroway/windsock:
         # aeroway=windsock
@@ -2735,7 +2735,7 @@ en:
       amenity/animal_shelter:
         # amenity=animal_shelter
         name: Animal Shelter
-        # 'terms: adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,pound,puppy,raptor,reptile,rescue,spca'
+        # 'terms: adoption,aspca,cat,dog,horse,kitten,pet care,pet rescue,puppy,raptor,reptile,rescue,spca,pound'
         terms: '<translate with synonyms or related terms for ''Animal Shelter'', separated by commas>'
       amenity/arts_centre:
         # amenity=arts_centre
@@ -2744,22 +2744,22 @@ en:
       amenity/atm:
         # amenity=atm
         name: ATM
-        # 'terms: cash,machine,money'
+        # 'terms: money,cash,machine'
         terms: '<translate with synonyms or related terms for ''ATM'', separated by commas>'
       amenity/bank:
         # amenity=bank
         name: Bank
-        # 'terms: check,credit union,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault'
+        # 'terms: credit union,check,deposit,fund,investment,repository,reserve,safe,savings,stock,treasury,trust,vault'
         terms: '<translate with synonyms or related terms for ''Bank'', separated by commas>'
       amenity/bar:
         # amenity=bar
         name: Bar
-        # 'terms: beer,bier,booze,dive'
+        # 'terms: dive,beer,bier,booze'
         terms: '<translate with synonyms or related terms for ''Bar'', separated by commas>'
       amenity/bar/lgbtq:
         # 'amenity=bar, lgbtq=primary'
         name: LGBTQ+ Bar
-        # 'terms: gay bar,lesbian bar,lgb bar,lgbt bar,lgbtq bar'
+        # 'terms: gay bar,lesbian bar,lgbtq bar,lgbt bar,lgb bar'
         terms: '<translate with synonyms or related terms for ''LGBTQ+ Bar'', separated by commas>'
       amenity/bbq:
         # amenity=bbq
@@ -2769,7 +2769,7 @@ en:
       amenity/bench:
         # amenity=bench
         name: Bench
-        # 'terms: chair,seat'
+        # 'terms: seat,chair'
         terms: '<translate with synonyms or related terms for ''Bench'', separated by commas>'
       amenity/bicycle_parking:
         # amenity=bicycle_parking
@@ -2784,17 +2784,17 @@ en:
       amenity/bicycle_parking/lockers:
         # 'amenity=bicycle_parking, bicycle_parking=lockers'
         name: Bicycle Lockers
-        # 'terms: Bike Lockers,cycle locker,cycling'
+        # 'terms: cycle locker,cycling,Bike Lockers'
         terms: '<translate with synonyms or related terms for ''Bicycle Lockers'', separated by commas>'
       amenity/bicycle_parking/shed:
         # 'amenity=bicycle_parking, bicycle_parking=shed'
         name: Bicycle Shed
-        # 'terms: Bike Shed,cycle shed,cycling'
+        # 'terms: cycle shed,cycling,Bike Shed'
         terms: '<translate with synonyms or related terms for ''Bicycle Shed'', separated by commas>'
       amenity/bicycle_rental:
         # amenity=bicycle_rental
         name: Bicycle Rental
-        # 'terms: bicycle,bicycle share,bike,bike share,bikeshare,cycle dock,cycle hub,cycleshare,cycling'
+        # 'terms: bike,bicycle,bikeshare,bike share,bicycle share,cycle dock,cycle hub,cycleshare,cycling'
         terms: '<translate with synonyms or related terms for ''Bicycle Rental'', separated by commas>'
       amenity/bicycle_repair_station:
         # amenity=bicycle_repair_station
@@ -2842,12 +2842,12 @@ en:
       amenity/casino:
         # amenity=casino
         name: Casino
-        # 'terms: blackjack,craps,gambling,poker,roulette'
+        # 'terms: gambling,roulette,craps,poker,blackjack'
         terms: '<translate with synonyms or related terms for ''Casino'', separated by commas>'
       amenity/charging_station:
         # amenity=charging_station
         name: Charging Station
-        # 'terms: Electric Vehicle,EV,Supercharger'
+        # 'terms: EV,Electric Vehicle,Supercharger'
         terms: '<translate with synonyms or related terms for ''Charging Station'', separated by commas>'
       amenity/childcare:
         # amenity=childcare
@@ -2857,7 +2857,7 @@ en:
       amenity/cinema:
         # amenity=cinema
         name: Cinema
-        # 'terms: drive-in,film,flick,movie,picture,screen,show,theater'
+        # 'terms: drive-in,film,flick,movie,theater,picture,show,screen'
         terms: '<translate with synonyms or related terms for ''Cinema'', separated by commas>'
       amenity/clinic:
         # amenity=clinic
@@ -2871,7 +2871,7 @@ en:
       amenity/clinic/fertility:
         # 'amenity=clinic, healthcare=clinic, healthcare:speciality=fertility'
         name: Fertility Clinic
-        # 'terms: egg,fertility,ovulation,reproductive,sperm'
+        # 'terms: egg,fertility,reproductive,sperm,ovulation'
         terms: '<translate with synonyms or related terms for ''Fertility Clinic'', separated by commas>'
       amenity/clock:
         # amenity=clock
@@ -2886,7 +2886,7 @@ en:
       amenity/college:
         # amenity=college
         name: College Grounds
-        # 'terms: undergraduate school,university'
+        # 'terms: university,undergraduate school'
         terms: '<translate with synonyms or related terms for ''College Grounds'', separated by commas>'
       amenity/community_centre:
         # amenity=community_centre
@@ -2896,7 +2896,7 @@ en:
       amenity/community_centre/lgbtq:
         # 'amenity=community_centre, lgbtq=primary'
         name: LGBTQ+ Community Center
-        # 'terms: lgb event,lgb hall,lgbt event,lgbt hall,lgbtq event,lgbtq hall'
+        # 'terms: lgbtq event,lgbtq hall,lgbt event,lgbt hall,lgb event,lgb hall'
         terms: '<translate with synonyms or related terms for ''LGBTQ+ Community Center'', separated by commas>'
       amenity/compressed_air:
         # amenity=compressed_air
@@ -2922,7 +2922,7 @@ en:
       amenity/dentist:
         # amenity=dentist
         name: Dentist
-        # 'terms: teeth,tooth'
+        # 'terms: tooth,teeth'
         terms: '<translate with synonyms or related terms for ''Dentist'', separated by commas>'
       amenity/dive_centre:
         # amenity=dive_centre
@@ -2937,7 +2937,7 @@ en:
       amenity/dojo:
         # amenity=dojo
         name: Dojo / Martial Arts Academy
-        # 'terms: dojang,martial arts'
+        # 'terms: martial arts,dojang'
         terms: '<translate with synonyms or related terms for ''Dojo / Martial Arts Academy'', separated by commas>'
       amenity/dressing_room:
         # amenity=dressing_room
@@ -2947,7 +2947,7 @@ en:
       amenity/drinking_water:
         # amenity=drinking_water
         name: Drinking Water
-        # 'terms: bubbler,drinking fountain,potable water source,water fountain,water tap'
+        # 'terms: potable water source,water fountain,drinking fountain,bubbler,water tap'
         terms: '<translate with synonyms or related terms for ''Drinking Water'', separated by commas>'
       amenity/driving_school:
         # amenity=driving_school
@@ -2979,12 +2979,12 @@ en:
       amenity/fast_food/donut:
         # 'amenity=fast_food, cuisine=donut'
         name: Donut Fast Food
-        # 'terms: breakfast,brunch,cafe,canteen,coffee,dine,diner,dining,donut,doughnut,eat,lunch,table'
+        # 'terms: breakfast,brunch,cafe,canteen,coffee,dine,diner,donut,doughnut,dining,eat,lunch,table'
         terms: '<translate with synonyms or related terms for ''Donut Fast Food'', separated by commas>'
       amenity/fast_food/fish_and_chips:
         # 'amenity=fast_food, cuisine=fish_and_chips'
         name: Fish & Chips Fast Food
-        # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,french fries,grill,lunch,table'
+        # 'terms: breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,french fries'
         terms: '<translate with synonyms or related terms for ''Fish & Chips Fast Food'', separated by commas>'
       amenity/fast_food/ice_cream:
         # 'amenity=fast_food, cuisine=ice_cream'
@@ -2997,12 +2997,12 @@ en:
       amenity/fast_food/mexican:
         # 'amenity=fast_food, cuisine=mexican'
         name: Mexican Fast Food
-        # 'terms: breakfast,burritos,dine,dining,dinner,drive-in,eat,enchiladas,fajitas,grill,lunch,nachos,quesadillas,salsa,table,tacos,tamales,tortillas'
+        # 'terms: breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas'
         terms: '<translate with synonyms or related terms for ''Mexican Fast Food'', separated by commas>'
       amenity/fast_food/pizza:
         # 'amenity=fast_food, cuisine=pizza'
         name: Pizza Fast Food
-        # 'terms: deep dish,dine,dining,dinner,drive-in,eat,lunch,slice,table,thin crust'
+        # 'terms: dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice'
         terms: '<translate with synonyms or related terms for ''Pizza Fast Food'', separated by commas>'
       amenity/fast_food/sandwich:
         # 'amenity=fast_food, cuisine=sandwich'
@@ -3019,7 +3019,7 @@ en:
       amenity/food_court:
         # amenity=food_court
         name: Food Court
-        # 'terms: fast food,food,restaurant'
+        # 'terms: fast food,restaurant,food'
         terms: '<translate with synonyms or related terms for ''Food Court'', separated by commas>'
       amenity/fountain:
         # amenity=fountain
@@ -3028,7 +3028,7 @@ en:
       amenity/fuel:
         # amenity=fuel
         name: Gas Station
-        # 'terms: biodiesel,cng,diesel,fuel,gasoline,lng,petrol,propane'
+        # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel'
         terms: '<translate with synonyms or related terms for ''Gas Station'', separated by commas>'
       amenity/grave_yard:
         # amenity=grave_yard
@@ -3047,17 +3047,17 @@ en:
       amenity/hunting_stand:
         # amenity=hunting_stand
         name: Hunting Stand
-        # 'terms: game,gun,lookout,rifle,shoot*,watch,wild'
+        # 'terms: game,gun,lookout,rifle,shoot*,wild,watch'
         terms: '<translate with synonyms or related terms for ''Hunting Stand'', separated by commas>'
       amenity/ice_cream:
         # amenity=ice_cream
         name: Ice Cream Shop
-        # 'terms: frozen,gelato,sherbet,sorbet,yogurt'
+        # 'terms: gelato,sorbet,sherbet,frozen,yogurt'
         terms: '<translate with synonyms or related terms for ''Ice Cream Shop'', separated by commas>'
       amenity/internet_cafe:
         # amenity=internet_cafe
         name: Internet Cafe
-        # 'terms: cafe,coffee,cybercafe,lanhouse,net,taxiphone,teleboutique'
+        # 'terms: cybercafe,taxiphone,teleboutique,coffee,cafe,net,lanhouse'
         terms: '<translate with synonyms or related terms for ''Internet Cafe'', separated by commas>'
       amenity/karaoke:
         # amenity=karaoke_box
@@ -3077,7 +3077,7 @@ en:
       amenity/letter_box:
         # amenity=letter_box
         name: Letter Box
-        # 'terms: curbside delivery box,direct-to-door delivery box,home delivery box,letter hole,letter plate,letter slot,letterbox,letterhole,letterplate,letterslot,mail box,mail hole,mail slot,mailbox,mailhole,mailslot,through-door delivery box'
+        # 'terms: curbside delivery box,home delivery box,direct-to-door delivery box,letter hole,letter plate,letter slot,letterbox,letterhole,letterplate,letterslot,mail box,mail hole,mail slot,mailbox,mailhole,mailslot,through-door delivery box'
         terms: '<translate with synonyms or related terms for ''Letter Box'', separated by commas>'
       amenity/library:
         # amenity=library
@@ -3105,7 +3105,7 @@ en:
       amenity/money_transfer:
         # amenity=money_transfer
         name: Money Transfer Station
-        # 'terms: bill,cable,cash to cash,check,currency,exchange,finance,money order,person to person,wire transfer'
+        # 'terms: money order,check,bill,currency,finance,wire transfer,cable,person to person,cash to cash,exchange'
         terms: '<translate with synonyms or related terms for ''Money Transfer Station'', separated by commas>'
       amenity/motorcycle_parking:
         # amenity=motorcycle_parking
@@ -3119,12 +3119,12 @@ en:
       amenity/nightclub:
         # amenity=nightclub
         name: Nightclub
-        # 'terms: dance club,dancing,disco*,night club'
+        # 'terms: disco*,night club,dancing,dance club'
         terms: '<translate with synonyms or related terms for ''Nightclub'', separated by commas>'
       amenity/nightclub/lgbtq:
         # 'amenity=nightclub, lgbtq=primary'
         name: LGBTQ+ Nightclub
-        # 'terms: gay nightclub,lesbian nightclub,lgb nightclub,lgbt nightclub,lgbtq nightclub'
+        # 'terms: gay nightclub,lesbian nightclub,lgbtq nightclub,lgbt nightclub,lgb nightclub'
         terms: '<translate with synonyms or related terms for ''LGBTQ+ Nightclub'', separated by commas>'
       amenity/nursing_home:
         # amenity=nursing_home
@@ -3142,7 +3142,7 @@ en:
       amenity/parking/park_ride:
         # 'amenity=parking, park_ride=yes'
         name: Park & Ride Lot
-        # 'terms: commuter parking lot,incentive parking lot,metro parking lot,P+R,park and pool lot,park and ride lot,public transit parking lot,public transport parking lot,train parking lot'
+        # 'terms: commuter parking lot,incentive parking lot,metro parking lot,park and pool lot,park and ride lot,P+R,public transport parking lot,public transit parking lot,train parking lot'
         terms: '<translate with synonyms or related terms for ''Park & Ride Lot'', separated by commas>'
       amenity/parking/underground:
         # 'amenity=parking, parking=underground'
@@ -3160,12 +3160,12 @@ en:
       amenity/payment_centre:
         # amenity=payment_centre
         name: Payment Center
-        # 'terms: bill pay,cash,check,currency,finance,money,tax pay'
+        # 'terms: check,tax pay,bill pay,currency,finance,cash,money'
         terms: '<translate with synonyms or related terms for ''Payment Center'', separated by commas>'
       amenity/payment_terminal:
         # amenity=payment_terminal
         name: Payment Terminal
-        # 'terms: atm,bill pay,card,cash,ekiosk,finance,interactive kiosk,money transfer,phone pay,tax pay'
+        # 'terms: interactive kiosk,ekiosk,atm,bill pay,tax pay,phone pay,finance,cash,money transfer,card'
         terms: '<translate with synonyms or related terms for ''Payment Terminal'', separated by commas>'
       amenity/pharmacy:
         # amenity=pharmacy
@@ -3175,7 +3175,7 @@ en:
       amenity/photo_booth:
         # amenity=photo_booth
         name: Photo Booth
-        # 'terms: booth,camera,kiosk,photo,photobooth'
+        # 'terms: photobooth,photo,booth,kiosk,camera'
         terms: '<translate with synonyms or related terms for ''Photo Booth'', separated by commas>'
       amenity/place_of_worship:
         # amenity=place_of_worship
@@ -3185,12 +3185,12 @@ en:
       amenity/place_of_worship/buddhist:
         # 'amenity=place_of_worship, religion=buddhist'
         name: Buddhist Temple
-        # 'terms: dojo,monastery,pagoda,stupa,temple,vihara,zendo'
+        # 'terms: stupa,vihara,monastery,temple,pagoda,zendo,dojo'
         terms: '<translate with synonyms or related terms for ''Buddhist Temple'', separated by commas>'
       amenity/place_of_worship/christian:
         # 'amenity=place_of_worship, religion=christian'
         name: Christian Church
-        # 'terms: abbey,basilica,bethel,cathedral,chancel,chantry,chapel,christian,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple'
+        # 'terms: christian,abbey,basilica,bethel,cathedral,chancel,chantry,chapel,fold,house of God,house of prayer,house of worship,minster,mission,oratory,parish,sacellum,sanctuary,shrine,tabernacle,temple'
         terms: '<translate with synonyms or related terms for ''Christian Church'', separated by commas>'
       amenity/place_of_worship/christian/jehovahs_witness:
         # 'amenity=place_of_worship, religion=christian, denomination=jehovahs_witness'
@@ -3210,7 +3210,7 @@ en:
       amenity/place_of_worship/hindu:
         # 'amenity=place_of_worship, religion=hindu'
         name: Hindu Temple
-        # 'terms: alayam,devasthana,kovil,kshetram,mandir,shrine,temple'
+        # 'terms: kovil,devasthana,mandir,kshetram,alayam,shrine,temple'
         terms: '<translate with synonyms or related terms for ''Hindu Temple'', separated by commas>'
       amenity/place_of_worship/jewish:
         # 'amenity=place_of_worship, religion=jewish'
@@ -3240,12 +3240,12 @@ en:
       amenity/planetarium:
         # amenity=planetarium
         name: Planetarium
-        # 'terms: astronomy,museum,observatory'
+        # 'terms: museum,astronomy,observatory'
         terms: '<translate with synonyms or related terms for ''Planetarium'', separated by commas>'
       amenity/police:
         # amenity=police
         name: Police
-        # 'terms: badge,constable,constabulary,cop,detective,enforcement,fed,law,officer,patrol'
+        # 'terms: badge,constable,constabulary,cop,detective,fed,law,enforcement,officer,patrol'
         terms: '<translate with synonyms or related terms for ''Police'', separated by commas>'
       amenity/polling_station:
         # amenity=polling_station
@@ -3270,42 +3270,42 @@ en:
       amenity/prep_school:
         # amenity=prep_school
         name: Test Prep / Tutoring School
-        # 'terms: academic,ACT,homework,math,reading,SAT,test prep,tutoring,writing'
+        # 'terms: academic,ACT,SAT,homework,math,reading,test prep,tutoring,writing'
         terms: '<translate with synonyms or related terms for ''Test Prep / Tutoring School'', separated by commas>'
       amenity/prison:
         # amenity=prison
         name: Prison Grounds
-        # 'terms: cell,correction,jail'
+        # 'terms: cell,jail,correction'
         terms: '<translate with synonyms or related terms for ''Prison Grounds'', separated by commas>'
       amenity/pub:
         # amenity=pub
         name: Pub
-        # 'terms: alcohol,beer,bier,booze,dive,drink'
+        # 'terms: alcohol,drink,dive,beer,bier,booze'
         terms: '<translate with synonyms or related terms for ''Pub'', separated by commas>'
       amenity/pub/lgbtq:
         # 'amenity=pub, lgbtq=primary'
         name: LGBTQ+ Pub
-        # 'terms: gay pub,lesbian pub,lgb pub,lgbt pub,lgbtq pub'
+        # 'terms: gay pub,lesbian pub,lgbtq pub,lgbt pub,lgb pub'
         terms: '<translate with synonyms or related terms for ''LGBTQ+ Pub'', separated by commas>'
       amenity/pub/microbrewery:
         # 'amenity=pub, microbrewery=yes'
         name: Brewpub
-        # 'terms: alcohol,beer,bier,booze,craft brewery,dive,drink,microbrewery,small batch brewery'
+        # 'terms: alcohol,drink,dive,beer,bier,booze,craft brewery,microbrewery,small batch brewery'
         terms: '<translate with synonyms or related terms for ''Brewpub'', separated by commas>'
       amenity/public_bath:
         # amenity=public_bath
         name: Public Bath
-        # 'terms: foot bath,hot springs,onsen'
+        # 'terms: onsen,foot bath,hot springs'
         terms: '<translate with synonyms or related terms for ''Public Bath'', separated by commas>'
       amenity/public_bookcase:
         # amenity=public_bookcase
         name: Public Bookcase
-        # 'terms: bookcrossing,library'
+        # 'terms: library,bookcrossing'
         terms: '<translate with synonyms or related terms for ''Public Bookcase'', separated by commas>'
       amenity/ranger_station:
         # amenity=ranger_station
         name: Ranger Station
-        # 'terms: backcountry office,permit center,permit centre,visitor center,visitor centre,warden center,warden office'
+        # 'terms: visitor center,visitor centre,permit center,permit centre,backcountry office,warden office,warden center'
         terms: '<translate with synonyms or related terms for ''Ranger Station'', separated by commas>'
       amenity/recycling:
         # amenity=recycling
@@ -3318,17 +3318,17 @@ en:
       amenity/recycling/container/green_waste:
         # 'amenity=recycling, recycling_type=container, recycling:green_waste=yes'
         name: Green Waste Container
-        # 'terms: biodegradable,biological,compost,decomposable,food scrap,garbage bin,garden waste,organic,rubbish'
+        # 'terms: biodegradable,biological,compost,decomposable,garbage bin,garden waste,organic,rubbish,food scrap'
         terms: '<translate with synonyms or related terms for ''Green Waste Container'', separated by commas>'
       amenity/recycling_centre:
         # 'amenity=recycling, recycling_type=centre'
         name: Recycling Center
-        # 'terms: bottle,can,dump,garbage,glass,rubbish,scrap,trash'
+        # 'terms: bottle,can,dump,glass,garbage,rubbish,scrap,trash'
         terms: '<translate with synonyms or related terms for ''Recycling Center'', separated by commas>'
       amenity/recycling_container:
         # 'amenity=recycling, recycling_type=container'
         name: Recycling Container
-        # 'terms: bin,bottle,can,garbage,glass,rubbish,scrap,trash'
+        # 'terms: bin,can,bottle,glass,garbage,rubbish,scrap,trash'
         terms: '<translate with synonyms or related terms for ''Recycling Container'', separated by commas>'
       amenity/register_office:
         # amenity=register_office
@@ -3366,17 +3366,17 @@ en:
       amenity/restaurant/greek:
         # 'amenity=restaurant, cuisine=greek'
         name: Greek Restaurant
-        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,gyros,lunch,olives,pitas,table'
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,gyros,pitas,olives'
         terms: '<translate with synonyms or related terms for ''Greek Restaurant'', separated by commas>'
       amenity/restaurant/indian:
         # 'amenity=restaurant, cuisine=indian'
         name: Indian Restaurant
-        # 'terms: bar,breakfast,curry,dine,dining,dinner,drive-in,eat,grill,lunch,table'
+        # 'terms: bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,curry'
         terms: '<translate with synonyms or related terms for ''Indian Restaurant'', separated by commas>'
       amenity/restaurant/italian:
         # 'amenity=restaurant, cuisine=italian'
         name: Italian Restaurant
-        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,pasta,pizza,table'
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,pasta,pizza'
         terms: '<translate with synonyms or related terms for ''Italian Restaurant'', separated by commas>'
       amenity/restaurant/japanese:
         # 'amenity=restaurant, cuisine=japanese'
@@ -3386,27 +3386,27 @@ en:
       amenity/restaurant/mexican:
         # 'amenity=restaurant, cuisine=mexican'
         name: Mexican Restaurant
-        # 'terms: bar,breakfast,burritos,dine,dining,dinner,drive-in,eat,enchiladas,fajitas,grill,lunch,nachos,quesadillas,salsa,table,tacos,tamales,tortillas'
+        # 'terms: bar,breakfast,dine,dining,dinner,drive-in,eat,grill,lunch,table,tacos,burritos,enchiladas,fajitas,nachos,tortillas,salsa,tamales,quesadillas'
         terms: '<translate with synonyms or related terms for ''Mexican Restaurant'', separated by commas>'
       amenity/restaurant/noodle:
         # 'amenity=restaurant, cuisine=noodle'
         name: Noodle Restaurant
-        # 'terms: bar,breakfast,cafe,café,canteen,cellophane noodles,dine,dining,dinner,drive-in,eat,grill,lunch,ramen noodles,rice noodles,soba noodles,soup,table'
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,ramen noodles,soup,soba noodles,cellophane noodles,rice noodles'
         terms: '<translate with synonyms or related terms for ''Noodle Restaurant'', separated by commas>'
       amenity/restaurant/pizza:
         # 'amenity=restaurant, cuisine=pizza'
         name: Pizza Restaurant
-        # 'terms: bar,deep dish,dine,dining,dinner,drive-in,eat,lunch,slice,table,thin crust'
+        # 'terms: bar,dine,dining,dinner,drive-in,eat,lunch,table,deep dish,thin crust,slice'
         terms: '<translate with synonyms or related terms for ''Pizza Restaurant'', separated by commas>'
       amenity/restaurant/seafood:
         # 'amenity=restaurant, cuisine=seafood'
         name: Seafood Restaurant
-        # 'terms: bar,breakfast,cafe,café,clams,crab,crustaceans,dine,dining,dinner,drive-in,eat,fish,grill,lobsters,lunch,molluscs,octopus,oysters,shellfish,shrimp,squid,table'
+        # 'terms: bar,breakfast,cafe,café,dine,dining,dinner,drive-in,eat,grill,lunch,table,fish,shellfish,molluscs,crustaceans,clams,oysters,lobsters,crab,shrimp,squid,octopus'
         terms: '<translate with synonyms or related terms for ''Seafood Restaurant'', separated by commas>'
       amenity/restaurant/steakhouse:
         # 'amenity=restaurant, cuisine=steak_house'
         name: Steakhouse
-        # 'terms: bar,beef,breakfast,cafe,café,canteen,chop house,dine,dining,dinner,drive-in,eat,grill,lunch,steak house,table'
+        # 'terms: bar,breakfast,cafe,café,canteen,dine,dining,dinner,drive-in,eat,grill,lunch,table,steak house,chop house,beef'
         terms: '<translate with synonyms or related terms for ''Steakhouse'', separated by commas>'
       amenity/restaurant/sushi:
         # 'amenity=restaurant, cuisine=sushi'
@@ -3431,12 +3431,12 @@ en:
       amenity/sanitary_dump_station:
         # amenity=sanitary_dump_station
         name: RV Toilet Disposal
-        # 'terms: Camper,CDP,Chemical Toilet,CTDP,Dump Station,Elsan,Motor Home,Sanitary'
+        # 'terms: Motor Home,Camper,Sanitary,Dump Station,Elsan,CDP,CTDP,Chemical Toilet'
         terms: '<translate with synonyms or related terms for ''RV Toilet Disposal'', separated by commas>'
       amenity/school:
         # amenity=school
         name: School Grounds
-        # 'terms: academy,elementary school,high school,middle school'
+        # 'terms: academy,elementary school,middle school,high school'
         terms: '<translate with synonyms or related terms for ''School Grounds'', separated by commas>'
       amenity/scrapyard:
         # amenity=scrapyard
@@ -3444,7 +3444,7 @@ en:
       amenity/shelter:
         # amenity=shelter
         name: Shelter
-        # 'terms: gazebo,lean-to,picnic'
+        # 'terms: lean-to,gazebo,picnic'
         terms: '<translate with synonyms or related terms for ''Shelter'', separated by commas>'
       amenity/shelter/gazebo:
         # 'amenity=shelter, shelter_type=gazebo'
@@ -3493,22 +3493,22 @@ en:
       amenity/social_facility/group_home:
         # 'amenity=social_facility, social_facility=group_home, social_facility:for=senior'
         name: Elderly Group Home
-        # 'terms: assisted living,care home,living,old,senior'
+        # 'terms: old,senior,living,care home,assisted living'
         terms: '<translate with synonyms or related terms for ''Elderly Group Home'', separated by commas>'
       amenity/social_facility/homeless_shelter:
         # 'amenity=social_facility, social_facility=shelter, social_facility:for=homeless'
         name: Homeless Shelter
-        # 'terms: displaced,houseless,unhoused'
+        # 'terms: houseless,unhoused,displaced'
         terms: '<translate with synonyms or related terms for ''Homeless Shelter'', separated by commas>'
       amenity/social_facility/nursing_home:
         # 'amenity=social_facility, social_facility=nursing_home, social_facility:for=senior'
         name: Nursing Home
-        # 'terms: assisted living,elderly,living,nursing,old,senior'
+        # 'terms: elderly,living,nursing,old,senior,assisted living'
         terms: '<translate with synonyms or related terms for ''Nursing Home'', separated by commas>'
       amenity/studio:
         # amenity=studio
         name: Studio
-        # 'terms: radio,recording,television'
+        # 'terms: recording,radio,television'
         terms: '<translate with synonyms or related terms for ''Studio'', separated by commas>'
       amenity/studio/audio:
         # 'amenity=studio, studio=audio'
@@ -3546,22 +3546,22 @@ en:
       amenity/theatre:
         # amenity=theatre
         name: Theater
-        # 'terms: musical,performance,play,theatre'
+        # 'terms: theatre,performance,play,musical'
         terms: '<translate with synonyms or related terms for ''Theater'', separated by commas>'
       amenity/theatre/type/amphi:
         # 'amenity=theatre, theatre:type=amphi'
         name: Amphitheatre
-        # 'terms: ampi,greek,open air,outdoor'
+        # 'terms: open air,outdoor,greek,ampi'
         terms: '<translate with synonyms or related terms for ''Amphitheatre'', separated by commas>'
       amenity/toilets:
         # amenity=toilets
         name: Toilets
-        # 'terms: bathroom,head,latrine,lavatory,outhouse,privy,restroom,W.C.,water closet,WC'
+        # 'terms: bathroom,restroom,outhouse,privy,head,lavatory,latrine,water closet,WC,W.C.'
         terms: '<translate with synonyms or related terms for ''Toilets'', separated by commas>'
       amenity/toilets/disposal/flush:
         # 'amenity=toilets, toilets:disposal=flush'
         name: Flush Toilets
-        # 'terms: bathroom,head,lavatory,privy,restroom,W.C.,water closet,WC'
+        # 'terms: bathroom,head,lavatory,privy,restroom,water closet,WC,W.C.'
         terms: '<translate with synonyms or related terms for ''Flush Toilets'', separated by commas>'
       amenity/toilets/disposal/pitlatrine:
         # 'amenity=toilets, toilets:disposal=pitlatrine'
@@ -3571,7 +3571,7 @@ en:
       amenity/townhall:
         # amenity=townhall
         name: Town Hall
-        # 'terms: city,courthouse,government,municipal,village'
+        # 'terms: village,city,government,courthouse,municipal'
         terms: '<translate with synonyms or related terms for ''Town Hall'', separated by commas>'
       amenity/toy_library:
         # amenity=toy_library
@@ -3581,7 +3581,7 @@ en:
       amenity/university:
         # amenity=university
         name: University Grounds
-        # 'terms: college,graduate school,master''s degree program,PhD program'
+        # 'terms: college,graduate school,PhD program,master''s degree program'
         terms: '<translate with synonyms or related terms for ''University Grounds'', separated by commas>'
       amenity/vehicle_inspection:
         # amenity=vehicle_inspection
@@ -3615,7 +3615,7 @@ en:
       amenity/vending_machine/drinks:
         # 'amenity=vending_machine, vending=drinks'
         name: Drink Vending Machine
-        # 'terms: beverage,drink,juice,pop,soda'
+        # 'terms: drink,soda,beverage,juice,pop'
         terms: '<translate with synonyms or related terms for ''Drink Vending Machine'', separated by commas>'
       amenity/vending_machine/electronics:
         # 'amenity=vending_machine, vending=electronics'
@@ -3630,12 +3630,12 @@ en:
       amenity/vending_machine/excrement_bags:
         # 'amenity=vending_machine, vending=excrement_bags'
         name: Excrement Bag Dispenser
-        # 'terms: animal,dog,excrement bags,poop,waste'
+        # 'terms: excrement bags,poop,waste,dog,animal'
         terms: '<translate with synonyms or related terms for ''Excrement Bag Dispenser'', separated by commas>'
       amenity/vending_machine/feminine_hygiene:
         # 'amenity=vending_machine, vending=feminine_hygiene'
         name: Feminine Hygiene Vending Machine
-        # 'terms: condom,menstrual hygiene products,pad,personal care,tampon,woman,women'
+        # 'terms: condom,tampon,pad,woman,women,menstrual hygiene products,personal care'
         terms: '<translate with synonyms or related terms for ''Feminine Hygiene Vending Machine'', separated by commas>'
       amenity/vending_machine/food:
         # 'amenity=vending_machine, vending=food'
@@ -3645,12 +3645,12 @@ en:
       amenity/vending_machine/fuel:
         # 'amenity=vending_machine, vending=fuel'
         name: Gas Pump
-        # 'terms: biodiesel,cng,diesel,fuel,gasoline,lng,petrol,propane'
+        # 'terms: petrol,fuel,gasoline,propane,diesel,lng,cng,biodiesel'
         terms: '<translate with synonyms or related terms for ''Gas Pump'', separated by commas>'
       amenity/vending_machine/ice_cream:
         # 'amenity=vending_machine, vending=ice_cream'
         name: Ice Cream Vending Machine
-        # 'terms: chocolate,frozen,ice cream,popsicle,vanilla'
+        # 'terms: chocolate,ice cream,frozen,popsicle,vanilla'
         terms: '<translate with synonyms or related terms for ''Ice Cream Vending Machine'', separated by commas>'
       amenity/vending_machine/newspapers:
         # 'amenity=vending_machine, vending=newspapers'
@@ -3675,7 +3675,7 @@ en:
       amenity/vending_machine/public_transport_tickets:
         # 'amenity=vending_machine, vending=public_transport_tickets'
         name: Transit Ticket Vending Machine
-        # 'terms: bus,ferry,rail,ticket,train,transportation'
+        # 'terms: bus,train,ferry,rail,ticket,transportation'
         terms: '<translate with synonyms or related terms for ''Transit Ticket Vending Machine'', separated by commas>'
       amenity/vending_machine/stamps:
         # 'amenity=vending_machine, vending=stamps'
@@ -3685,27 +3685,27 @@ en:
       amenity/vending_machine/sweets:
         # 'amenity=vending_machine, vending=sweets'
         name: Snack Vending Machine
-        # 'terms: candy,chip,cookie,cracker,gum,pretzel'
+        # 'terms: candy,gum,chip,pretzel,cookie,cracker'
         terms: '<translate with synonyms or related terms for ''Snack Vending Machine'', separated by commas>'
       amenity/veterinary:
         # amenity=veterinary
         name: Veterinary
-        # 'terms: animal hospital,pet clinic,pet doctor,veterinarian'
+        # 'terms: pet clinic,veterinarian,animal hospital,pet doctor'
         terms: '<translate with synonyms or related terms for ''Veterinary'', separated by commas>'
       amenity/waste/dog_excrement:
         # 'amenity=waste_basket, waste=dog_excrement'
         name: Dog Excrement Bin
-        # 'terms: bin,dog,garbage,litter,poo,rubbish,trash'
+        # 'terms: bin,garbage,rubbish,litter,trash,poo,dog'
         terms: '<translate with synonyms or related terms for ''Dog Excrement Bin'', separated by commas>'
       amenity/waste_basket:
         # amenity=waste_basket
         name: Waste Basket
-        # 'terms: bin,garbage,litter,rubbish,trash'
+        # 'terms: bin,garbage,rubbish,litter,trash'
         terms: '<translate with synonyms or related terms for ''Waste Basket'', separated by commas>'
       amenity/waste_disposal:
         # amenity=waste_disposal
         name: Garbage Dumpster
-        # 'terms: garbage,litter,rubbish,trash'
+        # 'terms: garbage,rubbish,litter,trash'
         terms: '<translate with synonyms or related terms for ''Garbage Dumpster'', separated by commas>'
       amenity/waste_transfer_station:
         # amenity=waste_transfer_station
@@ -3741,7 +3741,7 @@ en:
       attraction/amusement_ride:
         # attraction=amusement_ride
         name: Amusement Ride
-        # 'terms: carnival ride,theme park'
+        # 'terms: theme park,carnival ride'
         terms: '<translate with synonyms or related terms for ''Amusement Ride'', separated by commas>'
       attraction/animal:
         # attraction=animal
@@ -3751,52 +3751,52 @@ en:
       attraction/big_wheel:
         # attraction=big_wheel
         name: Big Wheel
-        # 'terms: amusement ride,ferris wheel,theme park'
+        # 'terms: ferris wheel,theme park,amusement ride'
         terms: '<translate with synonyms or related terms for ''Big Wheel'', separated by commas>'
       attraction/bumper_car:
         # attraction=bumper_car
         name: Bumper Cars
-        # 'terms: autoscooter,dodgem cars,theme park'
+        # 'terms: theme park,dodgem cars,autoscooter'
         terms: '<translate with synonyms or related terms for ''Bumper Cars'', separated by commas>'
       attraction/bungee_jumping:
         # attraction=bungee_jumping
         name: Bungee Jumping
-        # 'terms: bungy jumping,jumping platform,theme park'
+        # 'terms: theme park,bungy jumping,jumping platform'
         terms: '<translate with synonyms or related terms for ''Bungee Jumping'', separated by commas>'
       attraction/carousel:
         # attraction=carousel
         name: Carousel
-        # 'terms: flying horses,galloper,horseabout,jumper,merry-go-round,roundabout,theme park'
+        # 'terms: theme park,roundabout,merry-go-round,galloper,jumper,horseabout,flying horses'
         terms: '<translate with synonyms or related terms for ''Carousel'', separated by commas>'
       attraction/dark_ride:
         # attraction=dark_ride
         name: Dark Ride
-        # 'terms: ghost train,theme park'
+        # 'terms: theme park,ghost train'
         terms: '<translate with synonyms or related terms for ''Dark Ride'', separated by commas>'
       attraction/drop_tower:
         # attraction=drop_tower
         name: Drop Tower
-        # 'terms: amusement ride,big drop,gondola,theme park,tower'
+        # 'terms: theme park,amusement ride,gondola,tower,big drop'
         terms: '<translate with synonyms or related terms for ''Drop Tower'', separated by commas>'
       attraction/maze:
         # attraction=maze
         name: Maze
-        # 'terms: amusement ride,labyrinth,theme park'
+        # 'terms: theme park,amusement ride,labyrinth'
         terms: '<translate with synonyms or related terms for ''Maze'', separated by commas>'
       attraction/pirate_ship:
         # attraction=pirate_ship
         name: Pirate Ship
-        # 'terms: amusement ride,carnival ride,theme park'
+        # 'terms: theme park,carnival ride,amusement ride'
         terms: '<translate with synonyms or related terms for ''Pirate Ship'', separated by commas>'
       attraction/river_rafting:
         # attraction=river_rafting
         name: River Rafting
-        # 'terms: aquatic park,rafting simulator,river rafting ride,river rapids ride,theme park,water park'
+        # 'terms: theme park,aquatic park,water park,rafting simulator,river rafting ride,river rapids ride'
         terms: '<translate with synonyms or related terms for ''River Rafting'', separated by commas>'
       attraction/roller_coaster:
         # attraction=roller_coaster
         name: Roller Coaster
-        # 'terms: amusement ride,theme park'
+        # 'terms: theme park,amusement ride'
         terms: '<translate with synonyms or related terms for ''Roller Coaster'', separated by commas>'
       attraction/summer_toboggan:
         # attraction=summer_toboggan
@@ -3806,12 +3806,12 @@ en:
       attraction/train:
         # attraction=train
         name: Tourist Train
-        # 'terms: dotto train,park train,rackless train,road train,theme park,Tschu-Tschu train'
+        # 'terms: theme park,rackless train,road train,Tschu-Tschu train,dotto train,park train'
         terms: '<translate with synonyms or related terms for ''Tourist Train'', separated by commas>'
       attraction/water_slide:
         # attraction=water_slide
         name: Water Slide
-        # 'terms: aquatic park,flumes,hydroslides,theme park,water chutes,water park'
+        # 'terms: theme park,aquatic park,water park,flumes,water chutes,hydroslides'
         terms: '<translate with synonyms or related terms for ''Water Slide'', separated by commas>'
       barrier:
         # barrier=*
@@ -3863,7 +3863,7 @@ en:
       barrier/fence/railing:
         # 'barrier=fence, fence_type=railing'
         name: Railing
-        # 'terms: guard rail,handrail,railing'
+        # 'terms: railing,handrail,guard rail'
         terms: '<translate with synonyms or related terms for ''Railing'', separated by commas>'
       barrier/gate:
         # barrier=gate
@@ -3872,7 +3872,7 @@ en:
       barrier/guard_rail:
         # barrier=guard_rail
         name: Guard Rail
-        # 'terms: Armco barrier,crash barrier,guardrail,median barrier,roadside barrier,traffic barrier'
+        # 'terms: guardrail,traffic barrier,crash barrier,median barrier,roadside barrier,Armco barrier'
         terms: '<translate with synonyms or related terms for ''Guard Rail'', separated by commas>'
       barrier/hedge:
         # barrier=hedge
@@ -3894,7 +3894,7 @@ en:
       barrier/kerb/lowered:
         # kerb=lowered
         name: Lowered Curb
-        # 'terms: curb cut,curb ramp,dropped kerb,kerb ramp,pram ramp'
+        # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp'
         terms: '<translate with synonyms or related terms for ''Lowered Curb'', separated by commas>'
       barrier/kerb/raised:
         # kerb=raised
@@ -3920,7 +3920,7 @@ en:
       barrier/sally_port:
         # barrier=sally_port
         name: Sally Port
-        # 'terms: castle side gate,Postern'
+        # 'terms: Postern,castle side gate'
         terms: '<translate with synonyms or related terms for ''Sally Port'', separated by commas>'
       barrier/stile:
         # barrier=stile
@@ -3973,7 +3973,7 @@ en:
       building/bungalow:
         # building=bungalow
         name: Bungalow
-        # 'terms: detached,home'
+        # 'terms: home,detached'
         terms: '<translate with synonyms or related terms for ''Bungalow'', separated by commas>'
       building/bunker:
         # building=bunker
@@ -3985,7 +3985,7 @@ en:
       building/carport:
         # building=carport
         name: Carport
-        # 'terms: car,covered parking space,garage,porch'
+        # 'terms: covered parking space,garage,car,porch'
         terms: '<translate with synonyms or related terms for ''Carport'', separated by commas>'
       building/cathedral:
         # building=cathedral
@@ -4019,7 +4019,7 @@ en:
       building/detached:
         # building=detached
         name: Detached House
-        # 'terms: dwelling,family,home,residence,single'
+        # 'terms: home,single,family,residence,dwelling'
         terms: '<translate with synonyms or related terms for ''Detached House'', separated by commas>'
       building/dormitory:
         # building=dormitory
@@ -4047,7 +4047,7 @@ en:
       building/grandstand:
         # building=grandstand
         name: Grandstand
-        # 'terms: bleachers,stand,stands,tribune'
+        # 'terms: tribune,stand,stands,bleachers'
         terms: '<translate with synonyms or related terms for ''Grandstand'', separated by commas>'
       building/greenhouse:
         # building=greenhouse
@@ -4068,12 +4068,12 @@ en:
       building/house:
         # building=house
         name: House
-        # 'terms: dwelling,family,home,residence'
+        # 'terms: home,family,residence,dwelling'
         terms: '<translate with synonyms or related terms for ''House'', separated by commas>'
       building/houseboat:
         # building=houseboat
         name: Houseboat
-        # 'terms: dwelling,family,home,residence'
+        # 'terms: home,family,residence,dwelling'
         terms: '<translate with synonyms or related terms for ''Houseboat'', separated by commas>'
       building/hut:
         # building=hut
@@ -4120,12 +4120,12 @@ en:
       building/school:
         # building=school
         name: School Building
-        # 'terms: academy,elementary school,high school,middle school'
+        # 'terms: academy,elementary school,middle school,high school'
         terms: '<translate with synonyms or related terms for ''School Building'', separated by commas>'
       building/semidetached_house:
         # building=semidetached_house
         name: Semi-Detached House
-        # 'terms: double,duplex,dwelling,family,home,residence,twin'
+        # 'terms: home,double,duplex,twin,family,residence,dwelling'
         terms: '<translate with synonyms or related terms for ''Semi-Detached House'', separated by commas>'
       building/service:
         # building=service
@@ -4154,7 +4154,7 @@ en:
       building/terrace:
         # building=terrace
         name: Row Houses
-        # 'terms: brownstone,dwelling,family,home,residence,terrace'
+        # 'terms: home,terrace,brownstone,family,residence,dwelling'
         terms: '<translate with synonyms or related terms for ''Row Houses'', separated by commas>'
       building/train_station:
         # building=train_station
@@ -4248,12 +4248,12 @@ en:
       craft/confectionery:
         # craft=confectionery
         name: Candy Maker
-        # 'terms: candy,sweet'
+        # 'terms: sweet,candy'
         terms: '<translate with synonyms or related terms for ''Candy Maker'', separated by commas>'
       craft/distillery:
         # craft=distillery
         name: Distillery
-        # 'terms: alcohol,beverage,booze,bourbon,brandy,gin,hooch,liquor,mezcal,moonshine,rum,scotch,spirits,still,tequila,vodka,whiskey,whisky'
+        # 'terms: alcohol,beverage,bourbon,booze,brandy,gin,hooch,liquor,mezcal,moonshine,rum,scotch,spirits,still,tequila,vodka,whiskey,whisky'
         terms: '<translate with synonyms or related terms for ''Distillery'', separated by commas>'
       craft/dressmaker:
         # craft=dressmaker
@@ -4276,7 +4276,7 @@ en:
       craft/gardener:
         # craft=gardener
         name: Gardener
-        # 'terms: grounds keeper,landscaper'
+        # 'terms: landscaper,grounds keeper'
         terms: '<translate with synonyms or related terms for ''Gardener'', separated by commas>'
       craft/glaziery:
         # craft=glaziery
@@ -4290,7 +4290,7 @@ en:
       craft/hvac:
         # craft=hvac
         name: HVAC
-        # 'terms: air conditioning,heat*,vent*'
+        # 'terms: heat*,vent*,air conditioning'
         terms: '<translate with synonyms or related terms for ''HVAC'', separated by commas>'
       craft/insulator:
         # craft=insulation
@@ -4467,7 +4467,7 @@ en:
       emergency/life_ring:
         # emergency=life_ring
         name: Life Ring
-        # 'terms: kisbie ring,kisby ring,life buoy,perry buoy'
+        # 'terms: life buoy,kisby ring,kisbie ring,perry buoy'
         terms: '<translate with synonyms or related terms for ''Life Ring'', separated by commas>'
       emergency/lifeguard:
         # emergency=lifeguard
@@ -4495,7 +4495,7 @@ en:
       emergency/water_tank:
         # emergency=water_tank
         name: Emergency Water Tank
-        # 'terms: cistern,reservoir,water tank'
+        # 'terms: water tank,cistern,reservoir'
         terms: '<translate with synonyms or related terms for ''Emergency Water Tank'', separated by commas>'
       emergency/yes:
         # emergency=yes
@@ -4503,7 +4503,7 @@ en:
       entrance:
         # entrance=*
         name: Entrance/Exit
-        # 'terms: door,entrance,exit'
+        # 'terms: entrance,exit,door'
         terms: '<translate with synonyms or related terms for ''Entrance/Exit'', separated by commas>'
       ford:
         # ford=yes
@@ -4515,7 +4515,7 @@ en:
       golf/bunker:
         # golf=bunker
         name: Sand Trap
-        # 'terms: bunker,hazard'
+        # 'terms: hazard,bunker'
         terms: '<translate with synonyms or related terms for ''Sand Trap'', separated by commas>'
       golf/cartpath:
         # golf=cartpath
@@ -4561,7 +4561,7 @@ en:
       healthcare:
         # healthcare=*
         name: Healthcare Facility
-        # 'terms: clinic,disease,doctor,health,institution,sick,surgery,wellness'
+        # 'terms: clinic,doctor,disease,health,institution,sick,surgery,wellness'
         terms: '<translate with synonyms or related terms for ''Healthcare Facility'', separated by commas>'
       healthcare/alternative:
         # healthcare=alternative
@@ -4581,12 +4581,12 @@ en:
       healthcare/birthing_center:
         # healthcare=birthing_center
         name: Birthing Center
-        # 'terms: baby,childbirth,delivery,labor,labour,pregnancy'
+        # 'terms: baby,childbirth,delivery,labour,labor,pregnancy'
         terms: '<translate with synonyms or related terms for ''Birthing Center'', separated by commas>'
       healthcare/blood_donation:
         # healthcare=blood_donation
         name: Blood Donor Center
-        # 'terms: apheresis,blood bank,blood donation,blood transfusion,plasmapheresis,plateletpheresis,stem cell donation'
+        # 'terms: blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation'
         terms: '<translate with synonyms or related terms for ''Blood Donor Center'', separated by commas>'
       healthcare/counselling:
         # healthcare=counselling
@@ -4595,17 +4595,17 @@ en:
       healthcare/hospice:
         # healthcare=hospice
         name: Hospice
-        # 'terms: illness,terminal'
+        # 'terms: terminal,illness'
         terms: '<translate with synonyms or related terms for ''Hospice'', separated by commas>'
       healthcare/laboratory:
         # healthcare=laboratory
         name: Medical Laboratory
-        # 'terms: blood_check,medical_lab,medical_laboratory'
+        # 'terms: medical_laboratory,medical_lab,blood_check'
         terms: '<translate with synonyms or related terms for ''Medical Laboratory'', separated by commas>'
       healthcare/midwife:
         # healthcare=midwife
         name: Midwife
-        # 'terms: baby,childbirth,delivery,labor,labour,pregnancy'
+        # 'terms: baby,childbirth,delivery,labour,labor,pregnancy'
         terms: '<translate with synonyms or related terms for ''Midwife'', separated by commas>'
       healthcare/occupational_therapist:
         # healthcare=occupational_therapist
@@ -4625,7 +4625,7 @@ en:
       healthcare/podiatrist:
         # healthcare=podiatrist
         name: Podiatrist
-        # 'terms: feet,foot,nails'
+        # 'terms: foot,feet,nails'
         terms: '<translate with synonyms or related terms for ''Podiatrist'', separated by commas>'
       healthcare/psychotherapist:
         # healthcare=psychotherapist
@@ -4673,12 +4673,12 @@ en:
       highway/crossing/marked:
         # 'highway=crossing, crossing=marked'
         name: Marked Crosswalk
-        # 'terms: crosswalk,marked crossing,zebra crossing'
+        # 'terms: zebra crossing,marked crossing,crosswalk'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
       highway/crossing/marked-raised:
         # 'highway=crossing, crossing=marked, traffic_calming=table'
         name: Marked Crosswalk (Raised)
-        # 'terms: crosswalk,flat top,hump,marked crossing,slow,speed,zebra crossing'
+        # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
       highway/crossing/unmarked:
         # 'highway=crossing, crossing=unmarked'
@@ -4687,7 +4687,7 @@ en:
       highway/crossing/unmarked-raised:
         # 'highway=crossing, crossing=unmarked, traffic_calming=table'
         name: Unmarked Crossing (Raised)
-        # 'terms: flat top,hump,slow,speed'
+        # 'terms: flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'
       highway/crossing/zebra:
         # 'highway=crossing, crossing=zebra'
@@ -4703,7 +4703,7 @@ en:
       highway/cycleway/bicycle_foot:
         # 'highway=cycleway, foot=designated'
         name: Cycle & Foot Path
-        # 'terms: bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,rail trail,segregated trail'
+        # 'terms: bicycle and foot path,bike and pedestrian path,green way,greenway,mixed-use trail,multi-use trail,segregated trail,rail trail'
         terms: '<translate with synonyms or related terms for ''Cycle & Foot Path'', separated by commas>'
       highway/cycleway/crossing:
         # cycleway=crossing
@@ -4711,12 +4711,12 @@ en:
       highway/cycleway/crossing/marked:
         # 'cycleway=crossing, crossing=marked'
         name: Marked Cycle Crossing
-        # 'terms: bicycle crossing,bike crossing,cycle crosswalk,cycle path crossing,cycleway crossing'
+        # 'terms: cycle crosswalk,cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
         terms: '<translate with synonyms or related terms for ''Marked Cycle Crossing'', separated by commas>'
       highway/cycleway/crossing/unmarked:
         # 'cycleway=crossing, crossing=unmarked'
         name: Unmarked Cycle Crossing
-        # 'terms: bicycle crossing,bike crossing,cycle path crossing,cycleway crossing'
+        # 'terms: cycle path crossing,cycleway crossing,bicycle crossing,bike crossing'
         terms: '<translate with synonyms or related terms for ''Unmarked Cycle Crossing'', separated by commas>'
       highway/elevator:
         # highway=elevator
@@ -4736,7 +4736,7 @@ en:
       highway/footway/conveying:
         # 'highway=footway, conveying=*'
         name: Moving Walkway
-        # 'terms: autwalk,conveyor,moving sidewalk,skywalk,travelator,travellator,travolator'
+        # 'terms: moving sidewalk,autwalk,skywalk,travolator,travelator,travellator,conveyor'
         terms: '<translate with synonyms or related terms for ''Moving Walkway'', separated by commas>'
       highway/footway/crossing:
         # footway=crossing
@@ -4744,12 +4744,12 @@ en:
       highway/footway/marked:
         # 'footway=crossing, crossing=marked'
         name: Marked Crosswalk
-        # 'terms: marked crossing,marked foot path crossing,marked pedestrian crosswalk,zebra crossing'
+        # 'terms: marked foot path crossing,marked crossing,marked pedestrian crosswalk,zebra crossing'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk'', separated by commas>'
       highway/footway/marked-raised:
         # 'footway=crossing, crossing=marked, traffic_calming=table'
         name: Marked Crosswalk (Raised)
-        # 'terms: crosswalk,flat top,hump,marked crossing,slow,speed,zebra crossing'
+        # 'terms: zebra crossing,marked crossing,crosswalk,flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Marked Crosswalk (Raised)'', separated by commas>'
       highway/footway/sidewalk:
         # footway=sidewalk
@@ -4759,12 +4759,12 @@ en:
       highway/footway/unmarked:
         # 'footway=crossing, crossing=unmarked'
         name: Unmarked Crossing
-        # 'terms: unmarked crosswalk,unmarked foot path crossing,unmarked pedestrian crossing'
+        # 'terms: unmarked foot path crossing,unmarked crosswalk,unmarked pedestrian crossing'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing'', separated by commas>'
       highway/footway/unmarked-raised:
         # 'footway=crossing, crossing=unmarked, traffic_calming=table'
         name: Unmarked Crossing (Raised)
-        # 'terms: flat top,hump,slow,speed'
+        # 'terms: flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Unmarked Crossing (Raised)'', separated by commas>'
       highway/footway/zebra:
         # 'highway=footway, footway=crossing, crossing=zebra'
@@ -4775,7 +4775,7 @@ en:
       highway/give_way:
         # highway=give_way
         name: Yield Sign
-        # 'terms: give way,sign,yield'
+        # 'terms: give way,yield,sign'
         terms: '<translate with synonyms or related terms for ''Yield Sign'', separated by commas>'
       highway/living_street:
         # highway=living_street
@@ -4804,7 +4804,7 @@ en:
       highway/motorway_link:
         # highway=motorway_link
         name: Motorway Link
-        # 'terms: exit,off ramp,on ramp,ramp,road,street'
+        # 'terms: exit,ramp,road,street,on ramp,off ramp'
         terms: '<translate with synonyms or related terms for ''Motorway Link'', separated by commas>'
       highway/passing_place:
         # highway=passing_place
@@ -4839,7 +4839,7 @@ en:
       highway/primary_link:
         # highway=primary_link
         name: Primary Link
-        # 'terms: off ramp,on ramp,ramp,road,street'
+        # 'terms: on ramp,off ramp,ramp,road,street'
         terms: '<translate with synonyms or related terms for ''Primary Link'', separated by commas>'
       highway/raceway:
         # highway=raceway
@@ -4854,7 +4854,7 @@ en:
       highway/raceway/motocross:
         # 'highway=raceway, sport=motocross'
         name: Motocross Racetrack
-        # 'terms: motocross circuit,motorcycle track,motorsports,off-road racing,offroad moto racing'
+        # 'terms: off-road racing,offroad moto racing,motocross circuit,motorcycle track,motorsports'
         terms: '<translate with synonyms or related terms for ''Motocross Racetrack'', separated by commas>'
       highway/residential:
         # highway=residential
@@ -4879,7 +4879,7 @@ en:
       highway/secondary_link:
         # highway=secondary_link
         name: Secondary Link
-        # 'terms: off ramp,on ramp,ramp,road,street'
+        # 'terms: on ramp,off ramp,ramp,road,street'
         terms: '<translate with synonyms or related terms for ''Secondary Link'', separated by commas>'
       highway/service:
         # highway=service
@@ -4909,7 +4909,7 @@ en:
       highway/services:
         # highway=services
         name: Service Area
-        # 'terms: service station,services,travel plaza'
+        # 'terms: services,travel plaza,service station'
         terms: '<translate with synonyms or related terms for ''Service Area'', separated by commas>'
       highway/speed_camera:
         # highway=speed_camera
@@ -4918,7 +4918,7 @@ en:
       highway/steps:
         # highway=steps
         name: Steps
-        # 'terms: staircase,stairs,stairway'
+        # 'terms: stairs,staircase,stairway'
         terms: '<translate with synonyms or related terms for ''Steps'', separated by commas>'
       highway/steps/conveying:
         # 'highway=steps, conveying=*'
@@ -4928,12 +4928,12 @@ en:
       highway/stop:
         # highway=stop
         name: Stop Sign
-        # 'terms: halt,sign,stop'
+        # 'terms: stop,halt,sign'
         terms: '<translate with synonyms or related terms for ''Stop Sign'', separated by commas>'
       highway/street_lamp:
         # highway=street_lamp
         name: Street Lamp
-        # 'terms: gaslight,lamp,light,street light,streetlight'
+        # 'terms: streetlight,street light,lamp,light,gaslight'
         terms: '<translate with synonyms or related terms for ''Street Lamp'', separated by commas>'
       highway/tertiary:
         # highway=tertiary
@@ -4943,12 +4943,12 @@ en:
       highway/tertiary_link:
         # highway=tertiary_link
         name: Tertiary Link
-        # 'terms: off ramp,on ramp,ramp,road,street'
+        # 'terms: on ramp,off ramp,ramp,road,street'
         terms: '<translate with synonyms or related terms for ''Tertiary Link'', separated by commas>'
       highway/track:
         # highway=track
         name: Unmaintained Track Road
-        # 'terms: 4wd,4x4,agricultural road,atv,carriage road,double track,farm road,fire road,forest road,four wheel drive,jeep,logging road,offroad,primitive,quad,ranch road,rut,two track,unmaintained,woods road'
+        # 'terms: woods road,forest road,logging road,fire road,farm road,agricultural road,ranch road,carriage road,primitive,unmaintained,rut,offroad,4wd,4x4,four wheel drive,atv,quad,jeep,double track,two track'
         terms: '<translate with synonyms or related terms for ''Unmaintained Track Road'', separated by commas>'
       highway/traffic_mirror:
         # highway=traffic_mirror
@@ -4963,7 +4963,7 @@ en:
       highway/trailhead:
         # highway=trailhead
         name: Trailhead
-        # 'terms: hiking,mile zero,mountain biking,mountaineering,staging area,trail endpoint,trail start,trekking'
+        # 'terms: hiking,mile zero,mountain biking,mountaineering,trail endpoint,trail start,staging area,trekking'
         terms: '<translate with synonyms or related terms for ''Trailhead'', separated by commas>'
       highway/trunk:
         # highway=trunk
@@ -4973,7 +4973,7 @@ en:
       highway/trunk_link:
         # highway=trunk_link
         name: Trunk Link
-        # 'terms: off ramp,on ramp,ramp,road,street'
+        # 'terms: on ramp,off ramp,ramp,road,street'
         terms: '<translate with synonyms or related terms for ''Trunk Link'', separated by commas>'
       highway/turning_circle:
         # highway=turning_circle
@@ -5014,12 +5014,12 @@ en:
       historic/castle/palace:
         # 'historic=castle, castle_type=palace'
         name: Palace
-        # 'terms: king,queen,royal,Royal Residence'
+        # 'terms: Royal Residence,royal,king,queen'
         terms: '<translate with synonyms or related terms for ''Palace'', separated by commas>'
       historic/castle/stately:
         # 'historic=castle, castle_type=stately'
         name: Château
-        # 'terms: gentry,Historic Country House,nobility,representative,Stately Home'
+        # 'terms: Historic Country House,Stately Home,nobility,gentry,representative'
         terms: '<translate with synonyms or related terms for ''Château'', separated by commas>'
       historic/city_gate:
         # historic=city_gate
@@ -5034,17 +5034,17 @@ en:
       historic/manor:
         # historic=manor
         name: Manor House
-        # 'terms: estate,gentry,Mansion,nobility'
+        # 'terms: Mansion,gentry,nobility,estate'
         terms: '<translate with synonyms or related terms for ''Manor House'', separated by commas>'
       historic/memorial:
         # historic=memorial
         name: Memorial
-        # 'terms: dedicatory,epitaph,memory,monument,remember,remembrance,stolperstein'
+        # 'terms: dedicatory,epitaph,remember,remembrance,memory,monument,stolperstein'
         terms: '<translate with synonyms or related terms for ''Memorial'', separated by commas>'
       historic/memorial/plaque:
         # 'historic=memorial, memorial=plaque'
         name: Commemorative Plaque
-        # 'terms: dedicatory,epitaph,historical marker,memory,remember,remembrance'
+        # 'terms: dedicatory,epitaph,historical marker,remember,remembrance,memory'
         terms: '<translate with synonyms or related terms for ''Commemorative Plaque'', separated by commas>'
       historic/monument:
         # historic=monument
@@ -5069,7 +5069,7 @@ en:
       historic/wreck:
         # historic=wreck
         name: Shipwreck
-        # 'terms: boat,hull,maritime,mast,remains,ship'
+        # 'terms: hull,mast,maritime,remains,ship,boat'
         terms: '<translate with synonyms or related terms for ''Shipwreck'', separated by commas>'
       indoor:
         # indoor=*
@@ -5105,7 +5105,7 @@ en:
       indoor/stairs:
         # 'indoor=room, stairs=yes'
         name: Indoor Stairwell
-        # 'terms: stair,staircase,stairs,stairway,stairwell,steps'
+        # 'terms: stair,stairs,staircase,stairway,stairwell,steps'
         terms: '<translate with synonyms or related terms for ''Indoor Stairwell'', separated by commas>'
       indoor/wall:
         # indoor=wall
@@ -5115,7 +5115,7 @@ en:
       internet_access/wlan:
         # internet_access=wlan
         name: Wi-Fi Hotspot
-        # 'terms: hotspot,wi-fi,wifi'
+        # 'terms: wi-fi,wifi,hotspot'
         terms: '<translate with synonyms or related terms for ''Wi-Fi Hotspot'', separated by commas>'
       junction:
         # junction=yes
@@ -5141,7 +5141,7 @@ en:
       landuse/aquaculture:
         # landuse=aquaculture
         name: Aquaculture
-        # 'terms: algaculture,algae,aquafarming,crustacean,fish farm,mariculture,oyster farm,shrimp farm'
+        # 'terms: fish farm,crustacean,algae,aquafarming,shrimp farm,oyster farm,mariculture,algaculture'
         terms: '<translate with synonyms or related terms for ''Aquaculture'', separated by commas>'
       landuse/basin:
         # landuse=basin
@@ -5204,7 +5204,7 @@ en:
       landuse/greenhouse_horticulture:
         # landuse=greenhouse_horticulture
         name: Greenhouse Horticulture
-        # 'terms: flower,greenhouse,grow,horticulture,vivero'
+        # 'terms: flower,greenhouse,horticulture,grow,vivero'
         terms: '<translate with synonyms or related terms for ''Greenhouse Horticulture'', separated by commas>'
       landuse/harbour:
         # landuse=harbour
@@ -5252,7 +5252,7 @@ en:
       landuse/military/danger_area:
         # military=danger_area
         name: Danger Area
-        # 'terms: air force,army,base,blast,bomb,explo*,force,guard,marine,mine,navy,troop,war'
+        # 'terms: air force,army,base,blast,bomb,explo*,force,guard,mine,marine,navy,troop,war'
         terms: '<translate with synonyms or related terms for ''Danger Area'', separated by commas>'
       landuse/military/naval_base:
         # military=naval_base
@@ -5294,7 +5294,7 @@ en:
       landuse/railway:
         # landuse=railway
         name: Railway Corridor
-        # 'terms: rail,track,train'
+        # 'terms: rail,train,track'
         terms: '<translate with synonyms or related terms for ''Railway Corridor'', separated by commas>'
       landuse/recreation_ground:
         # landuse=recreation_ground
@@ -5342,7 +5342,7 @@ en:
       leisure/amusement_arcade:
         # leisure=amusement_arcade
         name: Amusement Arcade
-        # 'terms: driving simulators,pay-to-play games,pinball machines,video games'
+        # 'terms: pay-to-play games,video games,driving simulators,pinball machines'
         terms: '<translate with synonyms or related terms for ''Amusement Arcade'', separated by commas>'
       leisure/bandstand:
         # leisure=bandstand
@@ -5360,7 +5360,7 @@ en:
       leisure/bleachers:
         # leisure=bleachers
         name: Bleachers
-        # 'terms: bench,crowd,seat,seating,sports,stand,stands'
+        # 'terms: crowd,bench,sports,stand,stands,seat,seating'
         terms: '<translate with synonyms or related terms for ''Bleachers'', separated by commas>'
       leisure/bowling_alley:
         # leisure=bowling_alley
@@ -5380,12 +5380,12 @@ en:
       leisure/dancing_school:
         # 'leisure=dance, dance:teaching=yes'
         name: Dance School
-        # 'terms: dance teaching,jive,swing,tango,waltz'
+        # 'terms: jive,swing,tango,waltz,dance teaching'
         terms: '<translate with synonyms or related terms for ''Dance School'', separated by commas>'
       leisure/disc_golf_course:
         # leisure=disc_golf_course
         name: Disc Golf Course
-        # 'terms: disk golf,flying disc golf,frisbee golf,frolf,ultimate'
+        # 'terms: disk golf,frisbee golf,flying disc golf,frolf,ultimate'
         terms: '<translate with synonyms or related terms for ''Disc Golf Course'', separated by commas>'
       leisure/dog_park:
         # leisure=dog_park
@@ -5399,7 +5399,7 @@ en:
       leisure/firepit:
         # leisure=firepit
         name: Firepit
-        # 'terms: campfire,fireplace'
+        # 'terms: fireplace,campfire'
         terms: '<translate with synonyms or related terms for ''Firepit'', separated by commas>'
       leisure/fishing:
         # leisure=fishing
@@ -5409,12 +5409,12 @@ en:
       leisure/fitness_centre:
         # leisure=fitness_centre
         name: Gym / Fitness Center
-        # 'terms: gym,health,leisure,studio'
+        # 'terms: health,gym,leisure,studio'
         terms: '<translate with synonyms or related terms for ''Gym / Fitness Center'', separated by commas>'
       leisure/fitness_centre/yoga:
         # 'leisure=fitness_centre, sport=yoga'
         name: Yoga Studio
-        # 'terms: asanas,meditation,modern yoga,studio'
+        # 'terms: studio,asanas,modern yoga,meditation'
         terms: '<translate with synonyms or related terms for ''Yoga Studio'', separated by commas>'
       leisure/fitness_station:
         # leisure=fitness_station
@@ -5434,12 +5434,12 @@ en:
       leisure/fitness_station/horizontal_bar:
         # 'leisure=fitness_station, fitness_station=horizontal_bar'
         name: Exercise Horizontal Bar
-        # 'terms: bar,chin up,chinup,exercise,fitness,gym,pull up,pullup,trim trail'
+        # 'terms: bar,chinup,chin up,exercise,fitness,gym,pullup,pull up,trim trail'
         terms: '<translate with synonyms or related terms for ''Exercise Horizontal Bar'', separated by commas>'
       leisure/fitness_station/horizontal_ladder:
         # 'leisure=fitness_station, fitness_station=horizontal_ladder'
         name: Exercise Monkey Bars
-        # 'terms: bar,chin up,chinup,exercise,fitness,gym,ladder,monkey bars,pull up,pullup,trim trail'
+        # 'terms: bar,chinup,chin up,exercise,fitness,gym,ladder,monkey bars,pullup,pull up,trim trail'
         terms: '<translate with synonyms or related terms for ''Exercise Monkey Bars'', separated by commas>'
       leisure/fitness_station/hyperextension:
         # 'leisure=fitness_station, fitness_station=hyperextension'
@@ -5454,12 +5454,12 @@ en:
       leisure/fitness_station/push-up:
         # 'leisure=fitness_station, fitness_station=push-up'
         name: Push-Up Station
-        # 'terms: bar,exercise,fitness,gym,push up,pushup,trim trail'
+        # 'terms: bar,exercise,fitness,gym,pushup,push up,trim trail'
         terms: '<translate with synonyms or related terms for ''Push-Up Station'', separated by commas>'
       leisure/fitness_station/rings:
         # 'leisure=fitness_station, fitness_station=rings'
         name: Exercise Rings
-        # 'terms: exercise,fitness,gym,muscle up,pull up,pullup,trim trail'
+        # 'terms: exercise,fitness,gym,muscle up,pullup,pull up,trim trail'
         terms: '<translate with synonyms or related terms for ''Exercise Rings'', separated by commas>'
       leisure/fitness_station/sign:
         # 'leisure=fitness_station, fitness_station=sign'
@@ -5469,7 +5469,7 @@ en:
       leisure/fitness_station/sit-up:
         # 'leisure=fitness_station, fitness_station=sit-up'
         name: Sit-Up Station
-        # 'terms: crunch,exercise,fitness,gym,sit up,situp,trim trail'
+        # 'terms: crunch,exercise,fitness,gym,situp,sit up,trim trail'
         terms: '<translate with synonyms or related terms for ''Sit-Up Station'', separated by commas>'
       leisure/fitness_station/stairs:
         # 'leisure=fitness_station, fitness_station=stairs'
@@ -5488,7 +5488,7 @@ en:
       leisure/hackerspace:
         # leisure=hackerspace
         name: Hackerspace
-        # 'terms: hacklab,hackspace,makerspace'
+        # 'terms: makerspace,hackspace,hacklab'
         terms: '<translate with synonyms or related terms for ''Hackerspace'', separated by commas>'
       leisure/horse_riding:
         # leisure=horse_riding
@@ -5498,7 +5498,7 @@ en:
       leisure/ice_rink:
         # leisure=ice_rink
         name: Ice Rink
-        # 'terms: curling,hockey,skating'
+        # 'terms: hockey,skating,curling'
         terms: '<translate with synonyms or related terms for ''Ice Rink'', separated by commas>'
       leisure/marina:
         # leisure=marina
@@ -5518,7 +5518,7 @@ en:
       leisure/outdoor_seating:
         # leisure=outdoor_seating
         name: Outdoor Seating Area
-        # 'terms: al fresco,bar,beer garden,cafe,dining,patio,pub,restaurant'
+        # 'terms: al fresco,beer garden,dining,cafe,restaurant,pub,bar,patio'
         terms: '<translate with synonyms or related terms for ''Outdoor Seating Area'', separated by commas>'
       leisure/park:
         # leisure=park
@@ -5533,7 +5533,7 @@ en:
       leisure/picnic_table/chess:
         # 'leisure=picnic_table, sport=chess'
         name: Chess Table
-        # 'terms: bench,checkerboard,checkers,chequerboard,chess board,game table'
+        # 'terms: bench,chess board,checkerboard,checkers,chequerboard,game table'
         terms: '<translate with synonyms or related terms for ''Chess Table'', separated by commas>'
       leisure/pitch:
         # leisure=pitch
@@ -5548,7 +5548,7 @@ en:
       leisure/pitch/australian_football:
         # 'leisure=pitch, sport=australian_football'
         name: Australian Football Field
-        # 'terms: AFL,Aussie,football'
+        # 'terms: Aussie,AFL,football'
         terms: '<translate with synonyms or related terms for ''Australian Football Field'', separated by commas>'
       leisure/pitch/badminton:
         # 'leisure=pitch, sport=badminton'
@@ -5624,12 +5624,12 @@ en:
       leisure/pitch/softball:
         # 'leisure=pitch, sport=softball'
         name: Softball Field
-        # 'terms: diamond,softball'
+        # 'terms: softball,diamond'
         terms: '<translate with synonyms or related terms for ''Softball Field'', separated by commas>'
       leisure/pitch/table_tennis:
         # 'leisure=pitch, sport=table_tennis'
         name: Ping Pong Table
-        # 'terms: ping pong,table tennis'
+        # 'terms: table tennis,ping pong'
         terms: '<translate with synonyms or related terms for ''Ping Pong Table'', separated by commas>'
       leisure/pitch/tennis:
         # 'leisure=pitch, sport=tennis'
@@ -5656,12 +5656,12 @@ en:
       leisure/slipway:
         # leisure=slipway
         name: Slipway
-        # 'terms: boat landing,boat launch,boat ramp'
+        # 'terms: boat launch,boat ramp,boat landing'
         terms: '<translate with synonyms or related terms for ''Slipway'', separated by commas>'
       leisure/slipway_point:
         # leisure=slipway
         name: Slipway
-        # 'terms: boat landing,boat launch,boat ramp'
+        # 'terms: boat launch,boat ramp,boat landing'
         terms: '<translate with synonyms or related terms for ''Slipway'', separated by commas>'
       leisure/sports_centre:
         # leisure=sports_centre
@@ -5670,7 +5670,7 @@ en:
       leisure/sports_centre/climbing:
         # 'leisure=sports_centre, sport=climbing'
         name: Climbing Gym
-        # 'terms: abseiling,artificial climbing wall,belaying,bouldering,indoor rock wall,rappeling,rock climbing facility,rock gym,ropes'
+        # 'terms: abseiling,artificial climbing wall,belaying,bouldering,rock climbing facility,indoor rock wall,rappeling,rock gym,ropes'
         terms: '<translate with synonyms or related terms for ''Climbing Gym'', separated by commas>'
       leisure/sports_centre/swimming:
         # 'leisure=sports_centre, sport=swimming'
@@ -5684,12 +5684,12 @@ en:
       leisure/swimming_area:
         # leisure=swimming_area
         name: Natural Swimming Area
-        # 'terms: aquatics,dive,water'
+        # 'terms: dive,water,aquatics'
         terms: '<translate with synonyms or related terms for ''Natural Swimming Area'', separated by commas>'
       leisure/swimming_pool:
         # leisure=swimming_pool
         name: Swimming Pool
-        # 'terms: aquatics,dive,water'
+        # 'terms: dive,water,aquatics'
         terms: '<translate with synonyms or related terms for ''Swimming Pool'', separated by commas>'
       leisure/track:
         # leisure=track
@@ -5709,12 +5709,12 @@ en:
       leisure/track/horse_racing:
         # 'leisure=track, sport=horse_racing'
         name: Horse Racing Track
-        # 'terms: equestrian race track,horse race betting,horse racetrack,horseracing,horsetrack'
+        # 'terms: equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack'
         terms: '<translate with synonyms or related terms for ''Horse Racing Track'', separated by commas>'
       leisure/track/horse_racing_point:
         # 'leisure=track, sport=horse_racing'
         name: Horse Racing Track
-        # 'terms: equestrian race track,horse race betting,horse racetrack,horseracing,horsetrack'
+        # 'terms: equestrian race track,horse race betting,horseracing,horsetrack,horse racetrack'
         terms: '<translate with synonyms or related terms for ''Horse Racing Track'', separated by commas>'
       leisure/track/running:
         # 'leisure=track, sport=running'
@@ -5729,7 +5729,7 @@ en:
       leisure/water_park:
         # leisure=water_park
         name: Water Park
-        # 'terms: dive,pool,swim'
+        # 'terms: swim,pool,dive'
         terms: '<translate with synonyms or related terms for ''Water Park'', separated by commas>'
       line:
         name: Line
@@ -5746,7 +5746,7 @@ en:
       man_made/antenna:
         # man_made=antenna
         name: Antenna
-        # 'terms: broadcast,cell,cell phone,communication,mobile phone,radio,television,transmission,tv'
+        # 'terms: broadcast,cell phone,cell,communication,mobile phone,radio,television,transmission,tv'
         terms: '<translate with synonyms or related terms for ''Antenna'', separated by commas>'
       man_made/beacon:
         # man_made=beacon
@@ -5773,7 +5773,7 @@ en:
       man_made/cairn:
         # man_made=cairn
         name: Cairn
-        # 'terms: càrn,rock pile,stone pile,stone stack'
+        # 'terms: rock pile,stone stack,stone pile,càrn'
         terms: '<translate with synonyms or related terms for ''Cairn'', separated by commas>'
       man_made/chimney:
         # man_made=chimney
@@ -5855,7 +5855,7 @@ en:
       man_made/monitoring_station:
         # man_made=monitoring_station
         name: Monitoring Station
-        # 'terms: air,earthquake,gps,seismology,weather'
+        # 'terms: weather,earthquake,seismology,air,gps'
         terms: '<translate with synonyms or related terms for ''Monitoring Station'', separated by commas>'
       man_made/obelisk:
         # man_made=obelisk
@@ -5869,7 +5869,7 @@ en:
       man_made/petroleum_well:
         # man_made=petroleum_well
         name: Oil Well
-        # 'terms: drilling rig,oil derrick,oil drill,oil horse,oil pump,oil rig,petroleum well,pumpjack'
+        # 'terms: drilling rig,oil derrick,oil drill,oil horse,oil rig,oil pump,petroleum well,pumpjack'
         terms: '<translate with synonyms or related terms for ''Oil Well'', separated by commas>'
       man_made/pier:
         # man_made=pier
@@ -5884,17 +5884,17 @@ en:
       man_made/pipeline:
         # man_made=pipeline
         name: Pipeline
-        # 'terms: natural gas,oil,sewage,sewer,water'
+        # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Pipeline'', separated by commas>'
       man_made/pipeline/underground:
         # 'man_made=pipeline, location=underground'
         name: Underground Pipeline
-        # 'terms: natural gas,oil,sewage,sewer,water'
+        # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Underground Pipeline'', separated by commas>'
       man_made/pipeline/valve:
         # 'man_made=pipeline, pipeline=valve'
         name: Pipeline Valve
-        # 'terms: natural gas,oil,sewage,sewer,water'
+        # 'terms: oil,natural gas,water,sewer,sewage'
         terms: '<translate with synonyms or related terms for ''Pipeline Valve'', separated by commas>'
       man_made/pumping_station:
         # man_made=pumping_station
@@ -5903,12 +5903,12 @@ en:
       man_made/silo:
         # man_made=silo
         name: Silo
-        # 'terms: corn,grain,wheat'
+        # 'terms: grain,corn,wheat'
         terms: '<translate with synonyms or related terms for ''Silo'', separated by commas>'
       man_made/storage_tank:
         # man_made=storage_tank
         name: Storage Tank
-        # 'terms: gas,oil,petrol,water'
+        # 'terms: water,oil,gas,petrol'
         terms: '<translate with synonyms or related terms for ''Storage Tank'', separated by commas>'
       man_made/storage_tank/water:
         # 'man_made=storage_tank, content=water'
@@ -5923,17 +5923,17 @@ en:
       man_made/surveillance:
         # man_made=surveillance
         name: Surveillance
-        # 'terms: alpr,anpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam'
+        # 'terms: anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam'
         terms: '<translate with synonyms or related terms for ''Surveillance'', separated by commas>'
       man_made/surveillance/camera:
         # 'man_made=surveillance, surveillance:type=camera'
         name: Surveillance Camera
-        # 'terms: alpr,anpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam'
+        # 'terms: anpr,alpr,camera,car plate recognition,cctv,guard,license plate recognition,monitoring,number plate recognition,security,video,webcam'
         terms: '<translate with synonyms or related terms for ''Surveillance Camera'', separated by commas>'
       man_made/survey_point:
         # man_made=survey_point
         name: Survey Point
-        # 'terms: triangulation pillar,trig point,trigonometrical station'
+        # 'terms: trig point,triangulation pillar,trigonometrical station'
         terms: '<translate with synonyms or related terms for ''Survey Point'', separated by commas>'
       man_made/torii:
         # man_made=torii
@@ -5957,7 +5957,7 @@ en:
       man_made/tower/defensive:
         # 'man_made=tower, tower:type=defensive'
         name: Fortified Tower
-        # 'terms: Castle Tower,Defensive Tower'
+        # 'terms: Defensive Tower,Castle Tower'
         terms: '<translate with synonyms or related terms for ''Fortified Tower'', separated by commas>'
       man_made/tower/minaret:
         # 'man_made=tower, tower:type=minaret'
@@ -5967,7 +5967,7 @@ en:
       man_made/tower/observation:
         # 'man_made=tower, tower:type=observation'
         name: Observation Tower
-        # 'terms: fire tower,lookout tower'
+        # 'terms: lookout tower,fire tower'
         terms: '<translate with synonyms or related terms for ''Observation Tower'', separated by commas>'
       man_made/tunnel:
         # man_made=tunnel
@@ -5981,7 +5981,7 @@ en:
       man_made/wastewater_plant:
         # man_made=wastewater_plant
         name: Wastewater Plant
-        # 'terms: reclamation plant,sewage*,water treatment plant'
+        # 'terms: sewage*,water treatment plant,reclamation plant'
         terms: '<translate with synonyms or related terms for ''Wastewater Plant'', separated by commas>'
       man_made/water_tower:
         # man_made=water_tower
@@ -5998,32 +5998,32 @@ en:
       man_made/watermill:
         # man_made=watermill
         name: Watermill
-        # 'terms: mill,water,wheel'
+        # 'terms: water,wheel,mill'
         terms: '<translate with synonyms or related terms for ''Watermill'', separated by commas>'
       man_made/windmill:
         # man_made=windmill
         name: Windmill
-        # 'terms: mill,wheel,wind'
+        # 'terms: wind,wheel,mill'
         terms: '<translate with synonyms or related terms for ''Windmill'', separated by commas>'
       man_made/works:
         # man_made=works
         name: Factory
-        # 'terms: assembly,brewery,build,car,manufacture,plant,plastic,processing,refinery'
+        # 'terms: assembly,build,brewery,car,plant,plastic,processing,manufacture,refinery'
         terms: '<translate with synonyms or related terms for ''Factory'', separated by commas>'
       manhole:
         # manhole=*
         name: Manhole
-        # 'terms: cover,hole,sewage,sewer,telecom'
+        # 'terms: cover,hole,sewer,sewage,telecom'
         terms: '<translate with synonyms or related terms for ''Manhole'', separated by commas>'
       manhole/drain:
         # manhole=drain
         name: Storm Drain
-        # 'terms: cover,drain,hole,rain,sewage,sewer,storm'
+        # 'terms: cover,drain,hole,rain,sewer,sewage,storm'
         terms: '<translate with synonyms or related terms for ''Storm Drain'', separated by commas>'
       manhole/telecom:
         # manhole=telecom
         name: Telecom Manhole
-        # 'terms: bt,cover,hole,phone,telecom,telephone'
+        # 'terms: cover,phone,hole,telecom,telephone,bt'
         terms: '<translate with synonyms or related terms for ''Telecom Manhole'', separated by commas>'
       military/bunker:
         # military=bunker
@@ -6075,7 +6075,7 @@ en:
       natural/cave_entrance:
         # natural=cave_entrance
         name: Cave Entrance
-        # 'terms: cavern,cavity,grotto,hollow,shelter'
+        # 'terms: cavern,hollow,grotto,shelter,cavity'
         terms: '<translate with synonyms or related terms for ''Cave Entrance'', separated by commas>'
       natural/cliff:
         # natural=cliff
@@ -6128,12 +6128,12 @@ en:
       natural/rock:
         # natural=rock
         name: Attached Rock / Boulder
-        # 'terms: boulder,rock,stone'
+        # 'terms: boulder,stone,rock'
         terms: '<translate with synonyms or related terms for ''Attached Rock / Boulder'', separated by commas>'
       natural/saddle:
         # natural=saddle
         name: Saddle
-        # 'terms: mountain pass,pass,top'
+        # 'terms: pass,mountain pass,top'
         terms: '<translate with synonyms or related terms for ''Saddle'', separated by commas>'
       natural/sand:
         # natural=sand
@@ -6162,7 +6162,7 @@ en:
       natural/stone:
         # natural=stone
         name: Unattached Stone / Boulder
-        # 'terms: boulder,rock,stone'
+        # 'terms: boulder,stone,rock'
         terms: '<translate with synonyms or related terms for ''Unattached Stone / Boulder'', separated by commas>'
       natural/tree:
         # natural=tree
@@ -6175,12 +6175,12 @@ en:
       natural/valley:
         # natural=valley
         name: Valley
-        # 'terms: canyon,dale,dell,dene,depression,glen,gorge,gulley,gully,gultch,hollow,ravine,rift,vale'
+        # 'terms: canyon,dale,dell,dene,depression,glen,gorge,gully,gulley,gultch,hollow,ravine,rift,vale'
         terms: '<translate with synonyms or related terms for ''Valley'', separated by commas>'
       natural/volcano:
         # natural=volcano
         name: Volcano
-        # 'terms: crater,mountain'
+        # 'terms: mountain,crater'
         terms: '<translate with synonyms or related terms for ''Volcano'', separated by commas>'
       natural/water:
         # natural=water
@@ -6207,7 +6207,7 @@ en:
       natural/water/pond:
         # 'natural=water, water=pond'
         name: Pond
-        # 'terms: lakelet,mere,millpond,pool,tarn'
+        # 'terms: lakelet,millpond,tarn,pool,mere'
         terms: '<translate with synonyms or related terms for ''Pond'', separated by commas>'
       natural/water/reservoir:
         # 'natural=water, water=reservoir'
@@ -6226,7 +6226,7 @@ en:
       natural/water/wastewater:
         # 'natural=water, water=wastewater'
         name: Wastewater Basin
-        # 'terms: Clarifier Basin,excrement,Settling Basin,sewage,shit,wastewater'
+        # 'terms: excrement,shit,sewage,wastewater,Settling Basin,Clarifier Basin'
         terms: '<translate with synonyms or related terms for ''Wastewater Basin'', separated by commas>'
       natural/wetland:
         # natural=wetland
@@ -6241,7 +6241,7 @@ en:
       noexit/yes:
         # noexit=yes
         name: No Exit
-        # 'terms: dead end,no exit,road end'
+        # 'terms: no exit,road end,dead end'
         terms: '<translate with synonyms or related terms for ''No Exit'', separated by commas>'
       office:
         # office=*
@@ -6333,7 +6333,7 @@ en:
       office/financial_advisor:
         # office=financial_advisor
         name: Financial Advisor
-        # 'terms: 401k,inheritance,retirement,savings,stocks,wealth management'
+        # 'terms: 401k,inheritance,savings,stocks,retirement,wealth management'
         terms: '<translate with synonyms or related terms for ''Financial Advisor'', separated by commas>'
       office/forestry:
         # office=forestry
@@ -6351,7 +6351,7 @@ en:
       office/government/register_office:
         # 'office=government, government=register_office'
         name: Register Office
-        # 'terms: birth,certificate,clerk,death,marriage'
+        # 'terms: clerk,marriage,death,birth,certificate'
         terms: '<translate with synonyms or related terms for ''Register Office'', separated by commas>'
       office/government/tax:
         # 'office=government, government=tax'
@@ -6391,7 +6391,7 @@ en:
       office/ngo:
         # office=ngo
         name: NGO Office
-        # 'terms: ngo,non government,non-government,organisation,organization'
+        # 'terms: ngo,non government,non-government,organization,organisation'
         terms: '<translate with synonyms or related terms for ''NGO Office'', separated by commas>'
       office/notary:
         # office=notary
@@ -6408,12 +6408,12 @@ en:
       office/private_investigator:
         # office=private_investigator
         name: Private Investigator Office
-        # 'terms: PI,private detective,private eye'
+        # 'terms: PI,private eye,private detective'
         terms: '<translate with synonyms or related terms for ''Private Investigator Office'', separated by commas>'
       office/quango:
         # office=quango
         name: Quasi-NGO Office
-        # 'terms: ngo,non government,non-government,organisation,organization,quasi autonomous,quasi-autonomous'
+        # 'terms: ngo,non government,non-government,organization,organisation,quasi autonomous,quasi-autonomous'
         terms: '<translate with synonyms or related terms for ''Quasi-NGO Office'', separated by commas>'
       office/religion:
         # office=religion
@@ -6449,52 +6449,52 @@ en:
       office/water_utility:
         # office=water_utility
         name: Water Utility Office
-        # 'terms: utility,water board'
+        # 'terms: water board,utility'
         terms: '<translate with synonyms or related terms for ''Water Utility Office'', separated by commas>'
       piste/downhill:
         # 'piste:type=downhill'
         name: Downhill Piste/Ski Run
-        # 'terms: alpine,downhill,piste,ski,snowboard'
+        # 'terms: ski,alpine,snowboard,downhill,piste'
         terms: '<translate with synonyms or related terms for ''Downhill Piste/Ski Run'', separated by commas>'
       piste/downhill/halfpipe:
         # 'piste:type=downhill, man_made=piste:halfpipe'
         name: Halfpipe
-        # 'terms: alpine,downhill,half pipe,halfpipe,piste,ski,snowboard'
+        # 'terms: ski,alpine,halfpipe,half pipe,snowboard,downhill,piste'
         terms: '<translate with synonyms or related terms for ''Halfpipe'', separated by commas>'
       piste/hike:
         # 'piste:type=hike'
         name: Snowshoeing or Winter Hiking Trail
-        # 'terms: hike,piste,ski,snowshoe,snowshoeing,winter hiking'
+        # 'terms: hike,winter hiking,snowshoe,snowshoeing,piste,ski'
         terms: '<translate with synonyms or related terms for ''Snowshoeing or Winter Hiking Trail'', separated by commas>'
       piste/ice_skate:
         # 'piste:type=ice_skate'
         name: Ice Skating Piste
-        # 'terms: ice,piste,skating,ski'
+        # 'terms: ice,skating,ski,piste'
         terms: '<translate with synonyms or related terms for ''Ice Skating Piste'', separated by commas>'
       piste/nordic:
         # 'piste:type=nordic'
         name: Nordic or Crosscountry Piste/Ski Trail
-        # 'terms: crosscountry,nordic,piste,skating,ski'
+        # 'terms: ski,nordic,crosscountry,skating,piste'
         terms: '<translate with synonyms or related terms for ''Nordic or Crosscountry Piste/Ski Trail'', separated by commas>'
       piste/piste:
         # 'piste:type=*'
         name: Winter Sport Trails
-        # 'terms: alpine,crosscountry,downhill,horse,husky,ice,luge,nordic,skating,ski,ski touring,ski-joring,skitour,sled,sledge,sleigh,snowboard,snowshoe,snowshoeing,winter hiking'
+        # 'terms: ski,nordic,crosscountry,downhill,alpine,snowboard,skitour,ski touring,sled,luge,sleigh,sledge,ski-joring,husky,horse,winter hiking,snowshoe,snowshoeing,ice,skating'
         terms: '<translate with synonyms or related terms for ''Winter Sport Trails'', separated by commas>'
       piste/skitour:
         # 'piste:type=skitour'
         name: Ski Touring Trail
-        # 'terms: crosscountry,piste,ski,ski touring,skitour'
+        # 'terms: ski,skitour,crosscountry,ski touring,piste'
         terms: '<translate with synonyms or related terms for ''Ski Touring Trail'', separated by commas>'
       piste/sled:
         # 'piste:type=sled'
         name: Sled Piste
-        # 'terms: luge,piste,ski,sled,sledge,sleigh'
+        # 'terms: ski,sled,luge,sleigh,sledge,piste'
         terms: '<translate with synonyms or related terms for ''Sled Piste'', separated by commas>'
       piste/sleigh:
         # 'piste:type=sleigh'
         name: Sleigh Piste
-        # 'terms: horse,husky,luge,piste,ski,ski-joring,sled,sledge,sleigh'
+        # 'terms: ski,piste,sled,luge,sleigh,sledge,ski-joring,husky,horse'
         terms: '<translate with synonyms or related terms for ''Sleigh Piste'', separated by commas>'
       place:
         # place=*
@@ -6540,7 +6540,7 @@ en:
       place/plot:
         # place=plot
         name: Plot
-        # 'terms: land,lot,parcel,tract'
+        # 'terms: tract,land,lot,parcel'
         terms: '<translate with synonyms or related terms for ''Plot'', separated by commas>'
       place/quarter:
         # place=quarter
@@ -6656,7 +6656,7 @@ en:
       power/generator/source/hydro:
         # 'power=generator, generator:source=hydro'
         name: Water Turbine
-        # 'terms: dam,francis turbine,generator,hydroelectricity,kaplan turbine,pelton turbine'
+        # 'terms: dam,generator,francis turbine,hydroelectricity,kaplan turbine,pelton turbine'
         terms: '<translate with synonyms or related terms for ''Water Turbine'', separated by commas>'
       power/generator/source/nuclear:
         # 'power=generator, generator:source=nuclear, generator:method=fission'
@@ -6666,12 +6666,12 @@ en:
       power/generator/source/wind:
         # 'power=generator, generator:source=wind, generator:method=wind_turbine'
         name: Wind Turbine
-        # 'terms: generator,turbine,wind,windmill'
+        # 'terms: generator,turbine,windmill,wind'
         terms: '<translate with synonyms or related terms for ''Wind Turbine'', separated by commas>'
       power/line:
         # power=line
         name: Power Line
-        # 'terms: electric power transmission line,high tension line,high voltage line'
+        # 'terms: electric power transmission line,high voltage line,high tension line'
         terms: '<translate with synonyms or related terms for ''Power Line'', separated by commas>'
       power/minor_line:
         # power=minor_line
@@ -6740,7 +6740,7 @@ en:
       public_transport/platform/light_rail:
         # 'public_transport=platform, light_rail=yes'
         name: Light Rail Platform
-        # 'terms: electric,light rail,platform,public transit,public transportation,rail,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Light Rail Platform'', separated by commas>'
       public_transport/platform/light_rail_point:
         # 'public_transport=platform, light_rail=yes'
@@ -6772,22 +6772,22 @@ en:
       public_transport/platform/tram:
         # 'public_transport=platform, tram=yes'
         name: Tram Platform
-        # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Tram Platform'', separated by commas>'
       public_transport/platform/tram_point:
         # 'public_transport=platform, tram=yes'
         name: Tram Stop / Platform
-        # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Tram Stop / Platform'', separated by commas>'
       public_transport/platform/trolleybus:
         # 'public_transport=platform, trolleybus=yes'
         name: Trolleybus Platform
-        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,transit,transportation,trolley'
+        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Trolleybus Platform'', separated by commas>'
       public_transport/platform/trolleybus_point:
         # 'public_transport=platform, trolleybus=yes'
         name: Trolleybus Stop
-        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,transit,transportation,trolley'
+        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Trolleybus Stop'', separated by commas>'
       public_transport/platform_point:
         # public_transport=platform
@@ -6817,7 +6817,7 @@ en:
       public_transport/station_light_rail:
         # 'public_transport=station, light_rail=yes'
         name: Light Rail Station
-        # 'terms: electric,light rail,public transit,public transportation,rail,station,terminal,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,public transit,public transportation,rail,station,terminal,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Light Rail Station'', separated by commas>'
       public_transport/station_monorail:
         # 'public_transport=station, monorail=yes'
@@ -6842,12 +6842,12 @@ en:
       public_transport/station_tram:
         # 'public_transport=station, tram=yes'
         name: Tram Station
-        # 'terms: electric,light rail,public transit,public transportation,rail,station,streetcar,terminal,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,public transit,public transportation,rail,station,streetcar,terminal,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Tram Station'', separated by commas>'
       public_transport/station_trolleybus:
         # 'public_transport=station, trolleybus=yes'
         name: Trolleybus Station / Terminal
-        # 'terms: bus,electric,public transit,public transportation,station,streetcar,terminal,trackless,tram,transit,transportation,trolley'
+        # 'terms: bus,electric,public transit,public transportation,station,streetcar,terminal,trackless,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Trolleybus Station / Terminal'', separated by commas>'
       public_transport/stop_area:
         # 'type=public_transport, public_transport=stop_area'
@@ -6876,7 +6876,7 @@ en:
       public_transport/stop_position_light_rail:
         # 'public_transport=stop_position, light_rail=yes'
         name: Light Rail Stopping Location
-        # 'terms: electric,light rail,public transit,public transportation,rail,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,public transit,public transportation,rail,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Light Rail Stopping Location'', separated by commas>'
       public_transport/stop_position_monorail:
         # 'public_transport=stop_position, monorail=yes'
@@ -6896,12 +6896,12 @@ en:
       public_transport/stop_position_tram:
         # 'public_transport=stop_position, tram=yes'
         name: Tram Stopping Location
-        # 'terms: electric,light rail,public transit,public transportation,rail,streetcar,track,tram,transit,transportation,trolley'
+        # 'terms: electric,light rail,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Tram Stopping Location'', separated by commas>'
       public_transport/stop_position_trolleybus:
         # 'public_transport=stop_position, trolleybus=yes'
         name: Trolleybus Stopping Location
-        # 'terms: bus,electric,public transit,public transportation,streetcar,trackless,tram,transit,transportation,trolley'
+        # 'terms: bus,electric,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
         terms: '<translate with synonyms or related terms for ''Trolleybus Stopping Location'', separated by commas>'
       railway:
         # railway=*
@@ -6913,7 +6913,7 @@ en:
       railway/buffer_stop:
         # railway=buffer_stop
         name: Buffer Stop
-        # 'terms: buffer,halt,stop'
+        # 'terms: stop,halt,buffer'
         terms: '<translate with synonyms or related terms for ''Buffer Stop'', separated by commas>'
       railway/construction:
         # railway=construction
@@ -6922,7 +6922,7 @@ en:
       railway/crossing:
         # railway=crossing
         name: Railway Crossing (Path)
-        # 'terms: crossing,grade crossing,level crossing,path through railroad,pedestrian crossing,railroad crossing,train crossing'
+        # 'terms: crossing,pedestrian crossing,railroad crossing,level crossing,grade crossing,path through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Path)'', separated by commas>'
       railway/derail:
         # railway=derail
@@ -6936,7 +6936,7 @@ en:
       railway/funicular:
         # railway=funicular
         name: Funicular
-        # 'terms: cable car,cable railway,cliff railway,funicular railway,venicular'
+        # 'terms: venicular,cliff railway,cable car,cable railway,funicular railway'
         terms: '<translate with synonyms or related terms for ''Funicular'', separated by commas>'
       railway/halt:
         # railway=halt
@@ -6944,7 +6944,7 @@ en:
       railway/level_crossing:
         # railway=level_crossing
         name: Railway Crossing (Road)
-        # 'terms: crossing,grade crossing,level crossing,railroad crossing,road through railroad,train crossing'
+        # 'terms: crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing'
         terms: '<translate with synonyms or related terms for ''Railway Crossing (Road)'', separated by commas>'
       railway/light_rail:
         # railway=light_rail
@@ -6954,12 +6954,12 @@ en:
       railway/milestone:
         # railway=milestone
         name: Railway Milestone
-        # 'terms: marker,milestone'
+        # 'terms: milestone,marker'
         terms: '<translate with synonyms or related terms for ''Railway Milestone'', separated by commas>'
       railway/miniature:
         # railway=miniature
         name: Miniature Railway
-        # 'terms: minimum gauge railway,narrow gauge railway,rideable miniature railway'
+        # 'terms: rideable miniature railway,narrow gauge railway,minimum gauge railway'
         terms: '<translate with synonyms or related terms for ''Miniature Railway'', separated by commas>'
       railway/monorail:
         # railway=monorail
@@ -6968,7 +6968,7 @@ en:
       railway/narrow_gauge:
         # railway=narrow_gauge
         name: Narrow Gauge Rail
-        # 'terms: narrow gauge railroad,narrow gauge railway'
+        # 'terms: narrow gauge railway,narrow gauge railroad'
         terms: '<translate with synonyms or related terms for ''Narrow Gauge Rail'', separated by commas>'
       railway/platform:
         # railway=platform
@@ -6986,7 +6986,7 @@ en:
       railway/signal:
         # railway=signal
         name: Railway Signal
-        # 'terms: lights,signal'
+        # 'terms: signal,lights'
         terms: '<translate with synonyms or related terms for ''Railway Signal'', separated by commas>'
       railway/station:
         # railway=station
@@ -7004,12 +7004,12 @@ en:
       railway/switch:
         # railway=switch
         name: Railway Switch
-        # 'terms: points,switch'
+        # 'terms: switch,points'
         terms: '<translate with synonyms or related terms for ''Railway Switch'', separated by commas>'
       railway/train_wash:
         # railway=wash
         name: Train Wash
-        # 'terms: clean,wash'
+        # 'terms: wash,clean'
         terms: '<translate with synonyms or related terms for ''Train Wash'', separated by commas>'
       railway/tram:
         # railway=tram
@@ -7033,32 +7033,32 @@ en:
       seamark/beacon_isolated_danger:
         # 'seamark:type=beacon_isolated_danger'
         name: Danger Beacon
-        # 'terms: beacon isolated danger,iala,isolated danger beacon'
+        # 'terms: beacon isolated danger,isolated danger beacon,iala'
         terms: '<translate with synonyms or related terms for ''Danger Beacon'', separated by commas>'
       seamark/beacon_lateral:
         # 'seamark:type=beacon_lateral'
         name: Channel Beacon
-        # 'terms: beacon lateral,cevni,channel marker,iala,lateral beacon,lateral mark'
+        # 'terms: lateral beacon,beacon lateral,cevni,channel marker,iala,lateral mark'
         terms: '<translate with synonyms or related terms for ''Channel Beacon'', separated by commas>'
       seamark/buoy_lateral:
         # 'seamark:type=buoy_lateral'
         name: Channel Buoy
-        # 'terms: buoy lateral,cevni,channel marker,iala,lateral buoy,lateral mark'
+        # 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark'
         terms: '<translate with synonyms or related terms for ''Channel Buoy'', separated by commas>'
       seamark/buoy_lateral/green:
         # 'seamark:type=buoy_lateral, seamark:buoy_lateral:colour=green'
         name: Green Buoy
-        # 'terms: buoy lateral,cevni,channel marker,iala,lateral buoy,lateral mark'
+        # 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark'
         terms: '<translate with synonyms or related terms for ''Green Buoy'', separated by commas>'
       seamark/buoy_lateral/red:
         # 'seamark:type=buoy_lateral, seamark:buoy_lateral:colour=red'
         name: Red Buoy
-        # 'terms: buoy lateral,cevni,channel marker,iala,lateral buoy,lateral mark'
+        # 'terms: lateral buoy,buoy lateral,cevni,channel marker,iala,lateral mark'
         terms: '<translate with synonyms or related terms for ''Red Buoy'', separated by commas>'
       seamark/mooring:
         # 'seamark:type=mooring'
         name: Mooring
-        # 'terms: bollard,buoy,dolphin,pile,post'
+        # 'terms: dolphin,pile,bollard,buoy,post'
         terms: '<translate with synonyms or related terms for ''Mooring'', separated by commas>'
       shop:
         # shop=*
@@ -7067,7 +7067,7 @@ en:
       shop/agrarian:
         # shop=agrarian
         name: Farm Supply Shop
-        # 'terms: agricultural inputs,agricultural machines,agricultural tools,fertilizer,pesticides,seeds'
+        # 'terms: agricultural inputs,agricultural machines,seeds,pesticides,fertilizer,agricultural tools'
         terms: '<translate with synonyms or related terms for ''Farm Supply Shop'', separated by commas>'
       shop/alcohol:
         # shop=alcohol
@@ -7077,7 +7077,7 @@ en:
       shop/anime:
         # shop=anime
         name: Anime Shop
-        # 'terms: cosplay,dakimakura,figurine,japan,manga'
+        # 'terms: manga,japan,cosplay,figurine,dakimakura'
         terms: '<translate with synonyms or related terms for ''Anime Shop'', separated by commas>'
       shop/antiques:
         # shop=antiques
@@ -7114,7 +7114,7 @@ en:
       shop/beauty:
         # shop=beauty
         name: Beauty Shop
-        # 'terms: salon,spa,tanning'
+        # 'terms: spa,salon,tanning'
         terms: '<translate with synonyms or related terms for ''Beauty Shop'', separated by commas>'
       shop/beauty/nails:
         # 'shop=beauty, beauty=nails'
@@ -7159,7 +7159,7 @@ en:
       shop/butcher:
         # shop=butcher
         name: Butcher
-        # 'terms: beef,chicken,lamb,meat,pork'
+        # 'terms: chicken,beef,lamb,meat,pork'
         terms: '<translate with synonyms or related terms for ''Butcher'', separated by commas>'
       shop/candles:
         # shop=candles
@@ -7203,7 +7203,7 @@ en:
       shop/charity:
         # shop=charity
         name: Charity Store
-        # 'terms: nonprofit,op shop,thrift'
+        # 'terms: thrift,op shop,nonprofit'
         terms: '<translate with synonyms or related terms for ''Charity Store'', separated by commas>'
       shop/cheese:
         # shop=cheese
@@ -7227,7 +7227,7 @@ en:
       shop/clothes/underwear:
         # 'shop=clothes, clothes=underwear'
         name: Underwear Store
-        # 'terms: boutique,boxers,bras,brassieres,briefs,fashion,lingerie,panties,slips,socks,stockings,underclothes,undergarments,underpants,undies'
+        # 'terms: boutique,bras,brassieres,briefs,boxers,fashion,lingerie,panties,slips,socks,stockings,underclothes,undergarments,underpants,undies'
         terms: '<translate with synonyms or related terms for ''Underwear Store'', separated by commas>'
       shop/coffee:
         # shop=coffee
@@ -7236,7 +7236,7 @@ en:
       shop/computer:
         # shop=computer
         name: Computer Store
-        # 'terms: desktop,hardware,laptop,operating system,software'
+        # 'terms: desktop,laptop,hardware,operating system,software'
         terms: '<translate with synonyms or related terms for ''Computer Store'', separated by commas>'
       shop/confectionery:
         # shop=confectionery
@@ -7264,7 +7264,7 @@ en:
       shop/craft:
         # shop=craft
         name: Arts and Crafts Store
-        # 'terms: art*,frame,paint*'
+        # 'terms: art*,paint*,frame'
         terms: '<translate with synonyms or related terms for ''Arts and Crafts Store'', separated by commas>'
       shop/curtain:
         # shop=curtain
@@ -7274,7 +7274,7 @@ en:
       shop/dairy:
         # shop=dairy
         name: Dairy Store
-        # 'terms: cheese,egg,milk'
+        # 'terms: milk,egg,cheese'
         terms: '<translate with synonyms or related terms for ''Dairy Store'', separated by commas>'
       shop/deli:
         # shop=deli
@@ -7306,12 +7306,12 @@ en:
       shop/erotic:
         # shop=erotic
         name: Erotic Store
-        # 'terms: porn,sex'
+        # 'terms: sex,porn'
         terms: '<translate with synonyms or related terms for ''Erotic Store'', separated by commas>'
       shop/erotic/lgbtq:
         # 'shop=erotic, lgbtq=primary'
         name: LGBTQ+ Erotic Store
-        # 'terms: porn,sex'
+        # 'terms: sex,porn'
         terms: '<translate with synonyms or related terms for ''LGBTQ+ Erotic Store'', separated by commas>'
       shop/fabric:
         # shop=fabric
@@ -7334,7 +7334,7 @@ en:
       shop/fireplace:
         # shop=fireplace
         name: Fireplace Store
-        # 'terms: fireplace,masonry heater,stove'
+        # 'terms: fireplace,stove,masonry heater'
         terms: '<translate with synonyms or related terms for ''Fireplace Store'', separated by commas>'
       shop/fishing:
         # shop=fishing
@@ -7352,7 +7352,7 @@ en:
       shop/frame:
         # shop=frame
         name: Framing Shop
-        # 'terms: art*,frame,paint*,photo*'
+        # 'terms: art*,paint*,photo*,frame'
         terms: '<translate with synonyms or related terms for ''Framing Shop'', separated by commas>'
       shop/frozen_food:
         # shop=frozen_food
@@ -7365,7 +7365,7 @@ en:
       shop/funeral_directors:
         # shop=funeral_directors
         name: Funeral Home
-        # 'terms: memorial home,undertaker'
+        # 'terms: undertaker,memorial home'
         terms: '<translate with synonyms or related terms for ''Funeral Home'', separated by commas>'
       shop/furnace:
         # shop=furnace
@@ -7413,7 +7413,7 @@ en:
       shop/hairdresser_supply:
         # shop=hairdresser_supply
         name: Hairdresser Supply Store
-        # 'terms: barber,conditioner,shampoo'
+        # 'terms: barber,shampoo,conditioner'
         terms: '<translate with synonyms or related terms for ''Hairdresser Supply Store'', separated by commas>'
       shop/hardware:
         # shop=hardware
@@ -7422,7 +7422,7 @@ en:
       shop/health_food:
         # shop=health_food
         name: Health Food Shop
-        # 'terms: vegan,vegetarian,vitamins,wholefood'
+        # 'terms: wholefood,vitamins,vegetarian,vegan'
         terms: '<translate with synonyms or related terms for ''Health Food Shop'', separated by commas>'
       shop/hearing_aids:
         # shop=hearing_aids
@@ -7440,7 +7440,7 @@ en:
       shop/hobby:
         # shop=hobby
         name: Hobby Shop
-        # 'terms: figurine,manga,model'
+        # 'terms: manga,figurine,model'
         terms: '<translate with synonyms or related terms for ''Hobby Shop'', separated by commas>'
       shop/houseware:
         # shop=houseware
@@ -7459,7 +7459,7 @@ en:
       shop/jewelry:
         # shop=jewelry
         name: Jewelry Store
-        # 'terms: bracelet,diamond,earrings,gem,gold,jeweler,jeweller,jewellery,necklace,pins,ring,silver'
+        # 'terms: bracelet,diamond,earrings,gem,gold,jeweler,jewellery,jeweller,necklace,pins,ring,silver'
         terms: '<translate with synonyms or related terms for ''Jewelry Store'', separated by commas>'
       shop/kiosk:
         # shop=kiosk
@@ -7477,7 +7477,7 @@ en:
       shop/laundry/self_service:
         # 'shop=laundry, self_service=yes'
         name: Self-Service Laundry
-        # 'terms: Coin Laundry,Coin Wash,Launderette,Laundromat,Washateria'
+        # 'terms: Coin Laundry,Laundromat,Coin Wash,Launderette,Washateria'
         terms: '<translate with synonyms or related terms for ''Self-Service Laundry'', separated by commas>'
       shop/leather:
         # shop=leather
@@ -7513,7 +7513,7 @@ en:
       shop/military_surplus:
         # shop=military_surplus
         name: Military Surplus Store
-        # 'terms: armor,army surplus,army-navy store,navy surplus,tactical gear,war surplus shop,weapons'
+        # 'terms: armor,army-navy store,army surplus,navy surplus,tactical gear,war surplus shop,weapons'
         terms: '<translate with synonyms or related terms for ''Military Surplus Store'', separated by commas>'
       shop/mobile_phone:
         # shop=mobile_phone
@@ -7536,7 +7536,7 @@ en:
       shop/music:
         # shop=music
         name: Music Store
-        # 'terms: CDs,compact discs,tape casettes,vinyl records'
+        # 'terms: tape casettes,CDs,compact discs,vinyl records'
         terms: '<translate with synonyms or related terms for ''Music Store'', separated by commas>'
       shop/musical_instrument:
         # shop=musical_instrument
@@ -7564,7 +7564,7 @@ en:
       shop/outdoor:
         # shop=outdoor
         name: Outdoors Store
-        # 'terms: camping,climbing,hiking,outdoor equipment,outdoor supplies,outfitter'
+        # 'terms: camping,climbing,hiking,outfitter,outdoor equipment,outdoor supplies'
         terms: '<translate with synonyms or related terms for ''Outdoors Store'', separated by commas>'
       shop/outpost:
         # shop=outpost
@@ -7583,7 +7583,7 @@ en:
       shop/pastry:
         # shop=pastry
         name: Pastry Shop
-        # 'terms: cake shop,cakery,patisserie'
+        # 'terms: patisserie,cake shop,cakery'
         terms: '<translate with synonyms or related terms for ''Pastry Shop'', separated by commas>'
       shop/pawnbroker:
         # shop=pawnbroker
@@ -7645,7 +7645,7 @@ en:
       shop/second_hand:
         # shop=second_hand
         name: Consignment/Thrift Store
-        # 'terms: resale,second hand,secondhand,thrift,used'
+        # 'terms: secondhand,second hand,resale,thrift,used'
         terms: '<translate with synonyms or related terms for ''Consignment/Thrift Store'', separated by commas>'
       shop/sewing:
         # shop=sewing
@@ -7675,7 +7675,7 @@ en:
       shop/supermarket:
         # shop=supermarket
         name: Supermarket
-        # 'terms: grocery,shop,store'
+        # 'terms: grocery,store,shop'
         terms: '<translate with synonyms or related terms for ''Supermarket'', separated by commas>'
       shop/swimming_pool:
         # shop=swimming_pool
@@ -7768,7 +7768,7 @@ en:
       shop/wholesale:
         # shop=wholesale
         name: Wholesale Store
-        # 'terms: cash and carry,warehouse club'
+        # 'terms: warehouse club,cash and carry'
         terms: '<translate with synonyms or related terms for ''Wholesale Store'', separated by commas>'
       shop/window_blind:
         # shop=window_blind
@@ -7781,7 +7781,7 @@ en:
       telecom/data_center:
         # telecom=data_center
         name: Data Center
-        # 'terms: computer systems storage,information technology,server farm,telecommunications,the cloud'
+        # 'terms: computer systems storage,information technology,server farm,the cloud,telecommunications'
         terms: '<translate with synonyms or related terms for ''Data Center'', separated by commas>'
       tourism:
         # tourism=*
@@ -7813,7 +7813,7 @@ en:
       tourism/artwork/graffiti:
         # 'tourism=artwork, artwork_type=graffiti'
         name: Graffiti
-        # 'terms: Graffiti Artwork,Guerilla Artwork,Street Artwork'
+        # 'terms: Street Artwork,Guerilla Artwork,Graffiti Artwork'
         terms: '<translate with synonyms or related terms for ''Graffiti'', separated by commas>'
       tourism/artwork/installation:
         # 'tourism=artwork, artwork_type=installation'
@@ -7828,12 +7828,12 @@ en:
       tourism/artwork/sculpture:
         # 'tourism=artwork, artwork_type=sculpture'
         name: Sculpture
-        # 'terms: carving,figure,statue'
+        # 'terms: statue,figure,carving'
         terms: '<translate with synonyms or related terms for ''Sculpture'', separated by commas>'
       tourism/artwork/statue:
         # 'tourism=artwork, artwork_type=statue'
         name: Statue
-        # 'terms: carving,figure,sculpture'
+        # 'terms: sculpture,figure,carving'
         terms: '<translate with synonyms or related terms for ''Statue'', separated by commas>'
       tourism/attraction:
         # tourism=attraction
@@ -7842,17 +7842,17 @@ en:
       tourism/camp_pitch:
         # tourism=camp_pitch
         name: Camp Pitch
-        # 'terms: rv,tent'
+        # 'terms: tent,rv'
         terms: '<translate with synonyms or related terms for ''Camp Pitch'', separated by commas>'
       tourism/camp_site:
         # tourism=camp_site
         name: Campground
-        # 'terms: rv,tent'
+        # 'terms: tent,rv'
         terms: '<translate with synonyms or related terms for ''Campground'', separated by commas>'
       tourism/caravan_site:
         # tourism=caravan_site
         name: RV Park
-        # 'terms: Camper,Motor Home'
+        # 'terms: Motor Home,Camper'
         terms: '<translate with synonyms or related terms for ''RV Park'', separated by commas>'
       tourism/chalet:
         # tourism=chalet
@@ -7914,7 +7914,7 @@ en:
       tourism/museum:
         # tourism=museum
         name: Museum
-        # 'terms: art*,exhibit*,foundation,gallery,hall,institution,paint*,photo*,sculpt*'
+        # 'terms: art*,exhibit*,gallery,foundation,hall,institution,paint*,photo*,sculpt*'
         terms: '<translate with synonyms or related terms for ''Museum'', separated by commas>'
       tourism/picnic_site:
         # tourism=picnic_site
@@ -7936,7 +7936,7 @@ en:
       tourism/wilderness_hut:
         # tourism=wilderness_hut
         name: Wilderness Hut
-        # 'terms: backcountry hut,bothy,wilderness hut'
+        # 'terms: wilderness hut,backcountry hut,bothy'
         terms: '<translate with synonyms or related terms for ''Wilderness Hut'', separated by commas>'
       tourism/zoo:
         # tourism=zoo
@@ -7946,12 +7946,12 @@ en:
       tourism/zoo/petting:
         # 'tourism=zoo, zoo=petting_zoo'
         name: Petting Zoo
-        # 'terms: Children''s Farm,Children''s Zoo,farm animals,Petting Farm'
+        # 'terms: Children''s Zoo,Children''s Farm,Petting Farm,farm animals'
         terms: '<translate with synonyms or related terms for ''Petting Zoo'', separated by commas>'
       tourism/zoo/safari:
         # 'tourism=zoo, zoo=safari_park'
         name: Safari Park
-        # 'terms: Drive-In Zoo,Drive-Through Zoo'
+        # 'terms: Drive-Through Zoo,Drive-In Zoo'
         terms: '<translate with synonyms or related terms for ''Safari Park'', separated by commas>'
       tourism/zoo/wildlife:
         # 'tourism=zoo, zoo=wildlife_park'
@@ -7966,32 +7966,32 @@ en:
       traffic_calming/bump:
         # traffic_calming=bump
         name: Speed Bump
-        # 'terms: hump,slow,speed'
+        # 'terms: hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Speed Bump'', separated by commas>'
       traffic_calming/chicane:
         # traffic_calming=chicane
         name: Traffic Chicane
-        # 'terms: driveway link,slow,speed'
+        # 'terms: driveway link,speed,slow'
         terms: '<translate with synonyms or related terms for ''Traffic Chicane'', separated by commas>'
       traffic_calming/choker:
         # traffic_calming=choker
         name: Traffic Choker
-        # 'terms: slow,speed'
+        # 'terms: speed,slow'
         terms: '<translate with synonyms or related terms for ''Traffic Choker'', separated by commas>'
       traffic_calming/cushion:
         # traffic_calming=cushion
         name: Speed Cushion
-        # 'terms: bump,hump,slow,speed'
+        # 'terms: bump,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Speed Cushion'', separated by commas>'
       traffic_calming/dip:
         # traffic_calming=dip
         name: Dip
-        # 'terms: slow,speed'
+        # 'terms: speed,slow'
         terms: '<translate with synonyms or related terms for ''Dip'', separated by commas>'
       traffic_calming/hump:
         # traffic_calming=hump
         name: Speed Hump
-        # 'terms: bump,slow,speed'
+        # 'terms: bump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Speed Hump'', separated by commas>'
       traffic_calming/island:
         # traffic_calming=island
@@ -8001,42 +8001,42 @@ en:
       traffic_calming/rumble_strip:
         # traffic_calming=rumble_strip
         name: Rumble Strip
-        # 'terms: audible lines,growlers,sleeper lines'
+        # 'terms: audible lines,sleeper lines,growlers'
         terms: '<translate with synonyms or related terms for ''Rumble Strip'', separated by commas>'
       traffic_calming/table:
         # traffic_calming=table
         name: Speed Table
-        # 'terms: flat top,hump,slow,speed'
+        # 'terms: flat top,hump,speed,slow'
         terms: '<translate with synonyms or related terms for ''Speed Table'', separated by commas>'
       traffic_sign:
         # traffic_sign=*
         name: Traffic Sign
-        # 'terms: highway,road'
+        # 'terms: road,highway'
         terms: '<translate with synonyms or related terms for ''Traffic Sign'', separated by commas>'
       traffic_sign/city_limit:
         # traffic_sign=city_limit
         name: City Limit Sign
-        # 'terms: border,boundary,edge,hamlet,highway,road,town,village'
+        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
         terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
       traffic_sign/city_limit_vertex:
         # traffic_sign=city_limit
         name: City Limit Sign
-        # 'terms: border,boundary,edge,hamlet,highway,road,town,village'
+        # 'terms: town,village,hamlet,boundary,edge,border,road,highway'
         terms: '<translate with synonyms or related terms for ''City Limit Sign'', separated by commas>'
       traffic_sign/maxspeed:
         # traffic_sign=maxspeed
         name: Speed Limit Sign
-        # 'terms: highway,max speed,maximum speed,road'
+        # 'terms: max speed,maximum speed,road,highway'
         terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
       traffic_sign/maxspeed_vertex:
         # traffic_sign=maxspeed
         name: Speed Limit Sign
-        # 'terms: highway,max speed,maximum speed,road'
+        # 'terms: max speed,maximum speed,road,highway'
         terms: '<translate with synonyms or related terms for ''Speed Limit Sign'', separated by commas>'
       traffic_sign_vertex:
         # traffic_sign=*
         name: Traffic Sign
-        # 'terms: highway,road'
+        # 'terms: road,highway'
         terms: '<translate with synonyms or related terms for ''Traffic Sign'', separated by commas>'
       type/boundary:
         # type=boundary
@@ -8199,7 +8199,7 @@ en:
       waterway/dock:
         # waterway=dock
         name: Wet Dock / Dry Dock
-        # 'terms: boat,marine,ship,vessel'
+        # 'terms: boat,ship,vessel,marine'
         terms: '<translate with synonyms or related terms for ''Wet Dock / Dry Dock'', separated by commas>'
       waterway/drain:
         # waterway=drain
@@ -8208,7 +8208,7 @@ en:
       waterway/fuel:
         # waterway=fuel
         name: Marine Fuel Station
-        # 'terms: boat,diesel,gas,petrol'
+        # 'terms: petrol,gas,diesel,boat'
         terms: '<translate with synonyms or related terms for ''Marine Fuel Station'', separated by commas>'
       waterway/lock_gate:
         # waterway=lock_gate
@@ -8218,7 +8218,7 @@ en:
       waterway/milestone:
         # waterway=milestone
         name: Waterway Milestone
-        # 'terms: marker,milestone'
+        # 'terms: milestone,marker'
         terms: '<translate with synonyms or related terms for ''Waterway Milestone'', separated by commas>'
       waterway/river:
         # waterway=river
@@ -8231,7 +8231,7 @@ en:
       waterway/sanitary_dump_station:
         # waterway=sanitary_dump_station
         name: Marine Toilet Disposal
-        # 'terms: Boat,CDP,Chemical Toilet,CTDP,Dump Station,Elsan,Pump out,Pumpout,Sanitary,Watercraft'
+        # 'terms: Boat,Watercraft,Sanitary,Dump Station,Pumpout,Pump out,Elsan,CDP,CTDP,Chemical Toilet'
         terms: '<translate with synonyms or related terms for ''Marine Toilet Disposal'', separated by commas>'
       waterway/stream:
         # waterway=stream
diff --git a/data/presets/presets.json b/data/presets/presets.json
index dcf3c83a6..a2fd37974 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -27,7 +27,7 @@
     "advertising/billboard": {"fields": ["direction", "lit"], "geometry": ["point", "vertex", "line"], "tags": {"advertising": "billboard"}, "name": "Billboard"},
     "advertising/column": {"icon": "temaki-storage_tank", "fields": ["lit"], "geometry": ["point", "area"], "tags": {"advertising": "column"}, "name": "Advertising Column"},
     "aerialway/station": {"icon": "maki-aerialway", "geometry": ["point", "vertex", "area"], "fields": ["aerialway/access", "aerialway/summer/access", "elevation", "building_area"], "tags": {"aerialway": "station"}, "matchScore": 0.95, "name": "Aerialway Station", "searchable": false, "replacement": "public_transport/station_aerialway"},
-    "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "terms": ["ropeway", "tramway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"},
+    "aerialway/cable_car": {"icon": "fas-tram", "geometry": ["line"], "terms": ["tramway", "ropeway"], "fields": ["name", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/heating"], "tags": {"aerialway": "cable_car"}, "name": "Cable Car"},
     "aerialway/chair_lift": {"icon": "temaki-chairlift", "geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "chair_lift"}, "name": "Chair Lift"},
     "aerialway/drag_lift": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "drag_lift"}, "name": "Drag Lift"},
     "aerialway/gondola": {"icon": "maki-aerialway", "geometry": ["line"], "fields": ["name", "oneway", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "gondola"}, "name": "Gondola"},
@@ -37,7 +37,7 @@
     "aerialway/mixed_lift": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/occupancy", "aerialway/capacity", "aerialway/duration", "aerialway/bubble", "aerialway/heating"], "tags": {"aerialway": "mixed_lift"}, "name": "Mixed Lift"},
     "aerialway/platter": {"geometry": ["line"], "terms": ["button lift", "poma lift"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "platter"}, "name": "Platter Lift"},
     "aerialway/pylon": {"geometry": ["point", "vertex"], "fields": ["ref"], "tags": {"aerialway": "pylon"}, "name": "Aerialway Pylon"},
-    "aerialway/rope_tow": {"geometry": ["line"], "terms": ["bugel lift", "handle tow"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "name": "Rope Tow Lift"},
+    "aerialway/rope_tow": {"geometry": ["line"], "terms": ["handle tow", "bugel lift"], "fields": ["name", "oneway_yes", "aerialway/capacity", "aerialway/duration"], "tags": {"aerialway": "rope_tow"}, "name": "Rope Tow Lift"},
     "aerialway/t-bar": {"geometry": ["line"], "fields": ["name", "aerialway/capacity", "aerialway/duration"], "terms": ["tbar"], "tags": {"aerialway": "t-bar"}, "name": "T-bar Lift"},
     "aerialway/zip_line": {"geometry": ["line"], "fields": ["name", "oneway_yes", "aerialway/duration", "maxweight", "access_simple"], "terms": ["aerial runway", "canopy", "flying fox", "foefie slide", "gravity propelled aerial ropeslide", "Tyrolean traverse", "zip wire", "zip-line", "zipline", "zipwire"], "tags": {"aerialway": "zip_line"}, "name": "Zip Line"},
     "aeroway/aerodrome": {"icon": "maki-airport", "geometry": ["point", "area"], "fields": ["name", "iata", "icao", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "terms": ["aerodrome", "aeroway", "airplane", "airport", "jet", "plane"], "tags": {"aeroway": "aerodrome"}, "matchScore": 0.9, "name": "Airport"},
@@ -50,262 +50,262 @@
     "aeroway/parking_position": {"icon": "maki-airport", "geometry": ["vertex", "point", "line"], "fields": ["ref"], "tags": {"aeroway": "parking_position"}, "name": "Aircraft Parking Position"},
     "aeroway/runway": {"icon": "fas-plane-departure", "geometry": ["line", "area"], "terms": ["landing strip"], "fields": ["ref_runway", "surface", "length", "width"], "tags": {"aeroway": "runway"}, "name": "Runway"},
     "aeroway/taxiway": {"icon": "fas-plane", "geometry": ["line"], "fields": ["ref_taxiway", "surface"], "tags": {"aeroway": "taxiway"}, "name": "Taxiway"},
-    "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["aerodrome", "airport"], "fields": ["name", "operator", "building_area"], "moreFields": ["smoking", "wheelchair"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
+    "aeroway/terminal": {"icon": "maki-airport", "geometry": ["point", "area"], "terms": ["airport", "aerodrome"], "fields": ["name", "operator", "building_area"], "moreFields": ["wheelchair", "smoking"], "tags": {"aeroway": "terminal"}, "name": "Airport Terminal"},
     "aeroway/windsock": {"icon": "fas-wind", "geometry": ["point", "vertex"], "fields": ["ref", "lit", "height"], "moreFields": ["manufacturer"], "tags": {"aeroway": "windsock"}, "name": "Windsock"},
     "allotments/plot": {"geometry": ["area"], "fields": ["name", "ref"], "tags": {"allotments": "plot"}, "reference": {"key": "allotments", "value": "plot"}, "name": "Community Garden Plot"},
     "amenity/bus_station": {"icon": "maki-bus", "fields": ["name", "building_area", "operator", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "bus_station"}, "name": "Bus Station / Terminal", "searchable": false, "replacement": "public_transport/station_bus"},
     "amenity/coworking_space": {"icon": "maki-commercial", "fields": ["name", "address", "building_area", "opening_hours", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"amenity": "coworking_space"}, "name": "Coworking Space", "searchable": false},
-    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "searchable": false, "name": "Embassy"},
+    "amenity/embassy": {"icon": "maki-embassy", "fields": ["name", "country", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "embassy"}, "searchable": false, "name": "Embassy"},
     "amenity/ferry_terminal": {"icon": "maki-ferry", "fields": ["name", "network", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "ferry_terminal"}, "matchScore": 0.95, "name": "Ferry Station / Terminal", "searchable": false, "replacement": "public_transport/station_ferry"},
     "amenity/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nursing_home"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home", "searchable": false},
-    "amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "bottle", "can", "garbage", "glass", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false},
+    "amenity/recycling": {"icon": "maki-recycling", "fields": ["recycling_type", "recycling_accepts", "collection_times"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling"}, "name": "Recycling", "searchable": false},
     "amenity/register_office": {"icon": "maki-town-hall", "fields": ["name", "address", "building_area", "opening_hours", "operator"], "geometry": ["point", "area"], "tags": {"amenity": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office", "searchable": false},
     "amenity/scrapyard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"amenity": "scrapyard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "name": "Scrap Yard", "searchable": false},
     "amenity/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "swimming_pool"}, "reference": {"key": "leisure", "value": "swimming_pool"}, "name": "Swimming Pool", "searchable": false},
-    "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
-    "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
-    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "pound", "puppy", "raptor", "reptile", "rescue", "spca"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
+    "amenity/animal_boarding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_boarding"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["boarding", "cat", "cattery", "dog", "horse", "kennel", "kitten", "pet", "pet boarding", "pet care", "pet hotel", "puppy", "reptile"], "tags": {"amenity": "animal_boarding"}, "name": "Animal Boarding Facility"},
+    "amenity/animal_breeding": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_breeding"], "moreFields": ["website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["breeding", "bull", "cat", "cow", "dog", "horse", "husbandry", "kitten", "livestock", "pet breeding", "puppy", "reptile"], "tags": {"amenity": "animal_breeding"}, "name": "Animal Breeding Facility"},
+    "amenity/animal_shelter": {"icon": "maki-veterinary", "fields": ["name", "operator", "address", "building_area", "opening_hours", "animal_shelter"], "moreFields": ["website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["adoption", "aspca", "cat", "dog", "horse", "kitten", "pet care", "pet rescue", "puppy", "raptor", "reptile", "rescue", "spca", "pound"], "tags": {"amenity": "animal_shelter"}, "name": "Animal Shelter"},
     "amenity/arts_centre": {"icon": "maki-theatre", "fields": ["name", "address", "building_area", "opening_hours", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "arts_centre"}, "name": "Arts Center"},
-    "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "level", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["cash", "machine", "money"], "tags": {"amenity": "atm"}, "name": "ATM"},
-    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "credit union", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
-    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["beer", "bier", "booze", "dive"], "tags": {"amenity": "bar"}, "name": "Bar"},
-    "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgb bar", "lgbt bar", "lgbtq bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
+    "amenity/atm": {"icon": "maki-bank", "fields": ["operator", "network", "cash_in", "currency_multi", "drive_through"], "moreFields": ["brand", "covered", "height", "indoor", "level", "lit", "manufacturer", "name", "opening_hours", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["money", "cash", "machine"], "tags": {"amenity": "atm"}, "name": "ATM"},
+    "amenity/bank": {"icon": "maki-bank", "fields": ["name", "operator", "address", "building_area", "atm", "drive_through"], "moreFields": ["air_conditioning", "currency_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["credit union", "check", "deposit", "fund", "investment", "repository", "reserve", "safe", "savings", "stock", "treasury", "trust", "vault"], "tags": {"amenity": "bank"}, "name": "Bank"},
+    "amenity/bar": {"icon": "maki-bar", "fields": ["name", "address", "building_area", "outdoor_seating", "min_age", "brewery"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dive", "beer", "bier", "booze"], "tags": {"amenity": "bar"}, "name": "Bar"},
+    "amenity/bar/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "terms": ["gay bar", "lesbian bar", "lgbtq bar", "lgbt bar", "lgb bar"], "tags": {"amenity": "bar", "lgbtq": "primary"}, "name": "LGBTQ+ Bar"},
     "amenity/bbq": {"icon": "maki-bbq", "fields": ["covered", "fuel", "access_simple"], "moreFields": ["lit"], "geometry": ["point"], "terms": ["bbq", "grill"], "tags": {"amenity": "bbq"}, "name": "Barbecue/Grill"},
-    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["chair", "seat"], "tags": {"amenity": "bench"}, "name": "Bench"},
+    "amenity/bench": {"icon": "temaki-bench", "fields": ["backrest", "material", "seats", "colour"], "moreFields": ["access_simple", "height", "inscription", "level", "lit", "manufacturer", "operator"], "geometry": ["point", "vertex", "line"], "terms": ["seat", "chair"], "tags": {"amenity": "bench"}, "name": "Bench"},
     "amenity/bicycle_parking": {"icon": "maki-bicycle", "fields": ["bicycle_parking", "capacity", "operator", "operator/type", "covered", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["colour", "indoor", "level", "lit"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "cycle parking", "cycling"], "tags": {"amenity": "bicycle_parking"}, "name": "Bicycle Parking"},
     "amenity/bicycle_parking/building": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "opening_hours", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "building"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Parking Station", "cycle parking", "cycling", "Multi-Storey Bicycle Park", "Multi-Storey Bike Park"], "name": "Bicycle Parking Garage"},
-    "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Lockers", "cycle locker", "cycling"], "name": "Bicycle Lockers"},
-    "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["Bike Shed", "cycle shed", "cycling"], "name": "Bicycle Shed"},
-    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "covered", "email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bicycle", "bicycle share", "bike", "bike share", "bikeshare", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
+    "amenity/bicycle_parking/lockers": {"icon": "maki-bicycle", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "lockers"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle locker", "cycling", "Bike Lockers"], "name": "Bicycle Lockers"},
+    "amenity/bicycle_parking/shed": {"icon": "maki-bicycle", "fields": ["{amenity/bicycle_parking}", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "bicycle_parking", "bicycle_parking": "shed"}, "reference": {"key": "bicycle_parking"}, "terms": ["cycle shed", "cycling", "Bike Shed"], "name": "Bicycle Shed"},
+    "amenity/bicycle_rental": {"icon": "maki-bicycle", "fields": ["capacity", "network", "operator", "operator/type", "fee", "payment_multi_fee"], "moreFields": ["address", "email", "covered", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["bike", "bicycle", "bikeshare", "bike share", "bicycle share", "cycle dock", "cycle hub", "cycleshare", "cycling"], "tags": {"amenity": "bicycle_rental"}, "name": "Bicycle Rental"},
     "amenity/bicycle_repair_station": {"icon": "maki-bicycle", "fields": ["operator", "brand", "opening_hours", "fee", "payment_multi_fee", "charge_fee", "service/bicycle"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["bike chain", "bike multitool", "bike repair", "bike tools", "cycle pump", "cycle repair", "cycling"], "tags": {"amenity": "bicycle_repair_station"}, "name": "Bicycle Repair Tool Stand"},
     "amenity/biergarten": {"icon": "fas-beer", "fields": ["name", "address", "building", "outdoor_seating", "brewery"], "moreFields": ["{amenity/bar}"], "geometry": ["point", "area"], "tags": {"amenity": "biergarten"}, "terms": ["beer", "bier", "booze"], "name": "Biergarten"},
-    "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
-    "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
+    "amenity/boat_rental": {"icon": "temaki-boating", "fields": ["name", "operator", "operator/type", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "boat_rental"}, "name": "Boat Rental"},
+    "amenity/bureau_de_change": {"icon": "maki-bank", "fields": ["name", "operator", "payment_multi", "currency_multi", "address", "building_area"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["bureau de change", "money changer"], "tags": {"amenity": "bureau_de_change"}, "name": "Currency Exchange"},
     "amenity/cafe": {"icon": "maki-cafe", "fields": ["name", "cuisine", "address", "building_area", "outdoor_seating", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "bar", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access/ssid", "level", "min_age", "not/name", "opening_hours", "payment_multi", "phone", "reservation", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bistro", "coffee", "tea"], "tags": {"amenity": "cafe"}, "name": "Cafe"},
-    "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
-    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
-    "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
-    "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
-    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["blackjack", "craps", "gambling", "poker", "roulette"], "tags": {"amenity": "casino"}, "name": "Casino"},
-    "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "level", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["Electric Vehicle", "EV", "Supercharger"], "name": "Charging Station"},
-    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "max_age", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
-    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "picture", "screen", "show", "theater"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
-    "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
+    "amenity/car_pooling": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "opening_hours", "lit"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_pooling"}, "name": "Car Pooling"},
+    "amenity/car_rental": {"icon": "maki-car-rental", "fields": ["name", "operator", "address", "opening_hours", "payment_multi"], "moreFields": ["brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_rental"}, "name": "Car Rental"},
+    "amenity/car_sharing": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "capacity", "address", "payment_multi", "supervised"], "moreFields": ["lit", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_sharing"}, "name": "Car Sharing"},
+    "amenity/car_wash": {"icon": "temaki-car_wash", "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "self_service"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "car_wash"}, "name": "Car Wash"},
+    "amenity/casino": {"icon": "maki-casino", "fields": ["name", "operator", "address", "building_area", "opening_hours", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["gambling", "roulette", "craps", "poker", "blackjack"], "tags": {"amenity": "casino"}, "name": "Casino"},
+    "amenity/charging_station": {"icon": "fas-charging-station", "fields": ["name", "operator", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["brand", "covered", "level", "manufacturer"], "geometry": ["point"], "tags": {"amenity": "charging_station"}, "terms": ["EV", "Electric Vehicle", "Supercharger"], "name": "Charging Station"},
+    "amenity/childcare": {"icon": "fas-child", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "min_age", "max_age", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["daycare", "orphanage", "playgroup"], "tags": {"amenity": "childcare"}, "name": "Nursery/Childcare"},
+    "amenity/cinema": {"icon": "maki-cinema", "fields": ["name", "address", "screen", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["drive-in", "film", "flick", "movie", "theater", "picture", "show", "screen"], "tags": {"amenity": "cinema"}, "name": "Cinema"},
+    "amenity/clinic": {"icon": "maki-doctor", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["medical", "urgentcare"], "tags": {"amenity": "clinic"}, "addTags": {"amenity": "clinic", "healthcare": "clinic"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Clinic"},
     "amenity/clinic/abortion": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "abortion"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Abortion Clinic"},
-    "amenity/clinic/fertility": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["egg", "fertility", "ovulation", "reproductive", "sperm"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
+    "amenity/clinic/fertility": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["egg", "fertility", "reproductive", "sperm", "ovulation"], "tags": {"amenity": "clinic", "healthcare": "clinic", "healthcare:speciality": "fertility"}, "reference": {"key": "amenity", "value": "clinic"}, "name": "Fertility Clinic"},
     "amenity/clock": {"icon": "temaki-clock", "fields": ["name", "support", "display", "visibility", "date", "faces"], "moreFields": ["covered", "height", "indoor", "level", "lit", "manufacturer"], "geometry": ["point", "vertex"], "terms": ["time"], "tags": {"amenity": "clock"}, "name": "Clock"},
     "amenity/clock/sundial": {"icon": "temaki-clock", "fields": ["name", "support", "visibility", "inscription"], "moreFields": [], "geometry": ["point", "vertex"], "terms": ["gnomon", "shadow"], "tags": {"amenity": "clock", "display": "sundial"}, "reference": {"key": "display", "value": "sundial"}, "name": "Sundial"},
-    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["denomination", "email", "fax", "internet_access/ssid", "phone", "religion", "wheelchair"], "geometry": ["point", "area"], "terms": ["undergraduate school", "university"], "tags": {"amenity": "college"}, "name": "College Grounds"},
+    "amenity/college": {"icon": "maki-college", "fields": ["name", "operator", "operator/type", "address", "website", "internet_access", "internet_access/fee"], "moreFields": ["religion", "denomination", "internet_access/ssid", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["university", "undergraduate school"], "tags": {"amenity": "college"}, "name": "College Grounds"},
     "amenity/community_centre": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "hall"], "tags": {"amenity": "community_centre"}, "name": "Community Center"},
-    "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgb event", "lgb hall", "lgbt event", "lgbt hall", "lgbtq event", "lgbtq hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
+    "amenity/community_centre/lgbtq": {"icon": "maki-town-hall", "geometry": ["point", "area"], "terms": ["lgbtq event", "lgbtq hall", "lgbt event", "lgbt hall", "lgb event", "lgb hall"], "tags": {"amenity": "community_centre", "lgbtq": "primary"}, "name": "LGBTQ+ Community Center"},
     "amenity/compressed_air": {"icon": "maki-car", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "covered", "lit"], "moreFields": ["brand", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "compressed_air"}, "name": "Compressed Air"},
     "amenity/conference_centre": {"icon": "fas-user-tie", "fields": ["name", "operator", "building_area", "address", "website", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "conference_centre"}, "terms": ["auditorium", "conference", "exhibition", "exposition", "lecture"], "name": "Convention Center"},
     "amenity/courthouse": {"icon": "fas-gavel", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "courthouse"}, "name": "Courthouse"},
-    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
-    "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["teeth", "tooth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
-    "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
-    "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
-    "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dojang", "martial arts"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
+    "amenity/crematorium": {"icon": "maki-cemetery", "fields": ["name", "website", "phone", "opening_hours", "wheelchair"], "moreFields": ["address", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["area", "point"], "tags": {"amenity": "crematorium"}, "terms": ["cemetery", "funeral"], "name": "Crematorium"},
+    "amenity/dentist": {"icon": "maki-dentist", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["tooth", "teeth"], "tags": {"amenity": "dentist"}, "addTags": {"amenity": "dentist", "healthcare": "dentist"}, "reference": {"key": "amenity", "value": "dentist"}, "name": "Dentist"},
+    "amenity/dive_centre": {"icon": "temaki-scuba_diving", "fields": ["name", "operator", "address", "building_area", "opening_hours", "scuba_diving"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"amenity": "dive_centre"}, "name": "Dive Center"},
+    "amenity/doctors": {"icon": "maki-doctor", "fields": ["name", "operator", "healthcare/speciality", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["medic*", "physician"], "tags": {"amenity": "doctors"}, "addTags": {"amenity": "doctors", "healthcare": "doctor"}, "reference": {"key": "amenity", "value": "doctors"}, "name": "Doctor"},
+    "amenity/dojo": {"icon": "maki-pitch", "fields": ["name", "sport", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["martial arts", "dojang"], "tags": {"amenity": "dojo"}, "name": "Dojo / Martial Arts Academy"},
     "amenity/dressing_room": {"icon": "maki-clothing-store", "fields": ["operator", "access_simple", "gender", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "payment_multi_fee", "ref"], "geometry": ["point", "area"], "terms": ["changeroom", "dressing room", "fitting room", "locker room"], "tags": {"amenity": "dressing_room"}, "name": "Changing Room"},
-    "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "level", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["bubbler", "drinking fountain", "potable water source", "water fountain", "water tap"], "name": "Drinking Water"},
-    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
+    "amenity/drinking_water": {"icon": "maki-drinking-water", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "wheelchair"], "moreFields": ["covered", "indoor", "level", "lit"], "geometry": ["point"], "tags": {"amenity": "drinking_water"}, "terms": ["potable water source", "water fountain", "drinking fountain", "bubbler", "water tap"], "name": "Drinking Water"},
+    "amenity/driving_school": {"icon": "maki-car", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "driving_school"}, "name": "Driving School"},
     "amenity/events_venue": {"icon": "fas-users", "fields": ["name", "operator", "building_area", "address", "website", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "events_venue"}, "terms": ["banquet hall", "baptism", "Bar Mitzvah", "Bat Mitzvah", "birthdays", "celebrations", "conferences", "confirmation", "meetings", "parties", "party", "quinceañera", "reunions", "weddings"], "name": "Events Venue"},
-    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
+    "amenity/fast_food": {"icon": "maki-fast-food", "fields": ["name", "cuisine", "operator", "address", "building_area", "drive_through"], "moreFields": ["air_conditioning", "opening_hours", "diet_multi", "takeaway", "delivery", "smoking", "capacity", "outdoor_seating", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "fast_food"}, "terms": ["restaurant", "takeaway"], "name": "Fast Food"},
     "amenity/fast_food/ice_cream": {"icon": "fas-ice-cream", "geometry": ["point", "area"], "tags": {"amenity": "fast_food", "cuisine": "ice_cream"}, "reference": {"key": "cuisine", "value": "ice_cream"}, "name": "Ice Cream Fast Food", "searchable": false},
     "amenity/fast_food/burger": {"icon": "maki-fast-food", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "burger"}, "reference": {"key": "cuisine", "value": "burger"}, "name": "Burger Fast Food"},
     "amenity/fast_food/chicken": {"icon": "fas-drumstick-bite", "geometry": ["point", "area"], "terms": ["breakfast", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "chicken"}, "reference": {"key": "cuisine", "value": "chicken"}, "name": "Chicken Fast Food"},
-    "amenity/fast_food/donut": {"icon": "temaki-donut", "geometry": ["point", "area"], "terms": ["breakfast", "brunch", "cafe", "canteen", "coffee", "dine", "diner", "dining", "donut", "doughnut", "eat", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "donut"}, "reference": {"key": "cuisine", "value": "donut"}, "name": "Donut Fast Food"},
-    "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "french fries", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"},
+    "amenity/fast_food/donut": {"icon": "temaki-donut", "geometry": ["point", "area"], "terms": ["breakfast", "brunch", "cafe", "canteen", "coffee", "dine", "diner", "donut", "doughnut", "dining", "eat", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "donut"}, "reference": {"key": "cuisine", "value": "donut"}, "name": "Donut Fast Food"},
+    "amenity/fast_food/fish_and_chips": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "french fries"], "tags": {"amenity": "fast_food", "cuisine": "fish_and_chips"}, "reference": {"key": "cuisine", "value": "fish_and_chips"}, "name": "Fish & Chips Fast Food"},
     "amenity/fast_food/kebab": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "kebab"}, "reference": {"key": "cuisine", "value": "kebab"}, "name": "Kebab Fast Food"},
-    "amenity/fast_food/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["breakfast", "burritos", "dine", "dining", "dinner", "drive-in", "eat", "enchiladas", "fajitas", "grill", "lunch", "nachos", "quesadillas", "salsa", "table", "tacos", "tamales", "tortillas"], "tags": {"amenity": "fast_food", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Fast Food"},
-    "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["deep dish", "dine", "dining", "dinner", "drive-in", "eat", "lunch", "slice", "table", "thin crust"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"},
+    "amenity/fast_food/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "fast_food", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Fast Food"},
+    "amenity/fast_food/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "fast_food", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Fast Food"},
     "amenity/fast_food/sandwich": {"icon": "temaki-sandwich", "geometry": ["point", "area"], "terms": ["breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "fast_food", "cuisine": "sandwich"}, "reference": {"key": "cuisine", "value": "sandwich"}, "name": "Sandwich Fast Food"},
     "amenity/fire_station": {"icon": "maki-fire-station", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "fire_station"}, "name": "Fire Station"},
-    "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["capacity", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "outdoor_seating", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "food", "restaurant"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
+    "amenity/food_court": {"icon": "maki-restaurant", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["smoking", "outdoor_seating", "capacity", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "diet_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["fast food", "restaurant", "food"], "tags": {"amenity": "food_court"}, "name": "Food Court"},
     "amenity/fountain": {"icon": "temaki-fountain", "fields": ["name", "operator", "height", "lit"], "moreFields": ["covered", "indoor", "level", "manufacturer"], "geometry": ["point", "area"], "tags": {"amenity": "fountain"}, "name": "Fountain"},
-    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["building", "email", "fax", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["biodiesel", "cng", "diesel", "fuel", "gasoline", "lng", "petrol", "propane"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
-    "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
+    "amenity/fuel": {"icon": "maki-fuel", "fields": ["name", "brand", "operator", "address", "fuel_multi", "self_service"], "moreFields": ["opening_hours", "payment_multi", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "fuel"}, "name": "Gas Station"},
+    "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"},
     "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"},
-    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
-    "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "watch", "wild"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
-    "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["frozen", "gelato", "sherbet", "sorbet", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
-    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cafe", "coffee", "cybercafe", "lanhouse", "net", "taxiphone", "teleboutique"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
+    "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"},
+    "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"},
+    "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"},
+    "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
     "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "level", "max_age", "min_age", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
+    "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "min_age", "max_age", "level", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"},
     "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"},
-    "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "direct-to-door delivery box", "home delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
-    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "level", "opening_hours", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
+    "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"},
+    "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "opening_hours", "payment_multi", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"},
     "amenity/loading_dock": {"icon": "fas-truck-loading", "fields": ["ref", "operator", "access_simple", "door", "width", "height"], "moreFields": ["address", "colour", "level", "lit", "wheelchair"], "geometry": ["vertex"], "terms": ["door", "loading bay", "shipping", "unloading", "warehouse"], "tags": {"amenity": "loading_dock"}, "name": "Loading Dock"},
     "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "min_age", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"},
-    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
-    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
-    "amenity/money_transfer": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["email", "fax", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bill", "cable", "cash to cash", "check", "currency", "exchange", "finance", "money order", "person to person", "wire transfer"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
+    "amenity/marketplace": {"icon": "maki-shop", "fields": ["name", "operator", "address", "building", "opening_hours"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "marketplace"}, "name": "Marketplace"},
+    "amenity/monastery": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "monastery", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "monastery"}, "name": "Monastery Grounds"},
+    "amenity/money_transfer": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "payment_multi", "currency_multi"], "moreFields": ["opening_hours", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["money order", "check", "bill", "currency", "finance", "wire transfer", "cable", "person to person", "cash to cash", "exchange"], "tags": {"amenity": "money_transfer"}, "name": "Money Transfer Station"},
     "amenity/motorcycle_parking": {"icon": "fas-motorcycle", "fields": ["capacity", "operator", "covered", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "motorcycle_parking"}, "name": "Motorcycle Parking"},
-    "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
-    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["dance club", "dancing", "disco*", "night club"], "name": "Nightclub"},
-    "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgb nightclub", "lgbt nightclub", "lgbtq nightclub"], "name": "LGBTQ+ Nightclub"},
+    "amenity/music_school": {"icon": "maki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["school of music"], "tags": {"amenity": "music_school"}, "name": "Music School"},
+    "amenity/nightclub": {"icon": "maki-bar", "fields": ["name", "operator", "address", "building_area", "opening_hours", "min_age", "smoking"], "moreFields": ["air_conditioning", "email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "nightclub"}, "terms": ["disco*", "night club", "dancing", "dance club"], "name": "Nightclub"},
+    "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["ref", "access_simple", "address", "level"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
     "amenity/parking": {"icon": "maki-car", "fields": ["operator", "operator/type", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "charge_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
-    "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "height", "levels"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "matchScore": 1.05, "name": "Multilevel Parking Garage"},
-    "amenity/parking/park_ride": {"icon": "maki-car", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "P+R", "park and pool lot", "park and ride lot", "public transit parking lot", "public transport parking lot", "train parking lot"], "name": "Park & Ride Lot"},
+    "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "levels", "height"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "matchScore": 1.05, "name": "Multilevel Parking Garage"},
+    "amenity/parking/park_ride": {"icon": "maki-car", "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "park_ride": "yes"}, "reference": {"key": "park_ride", "value": "yes"}, "terms": ["commuter parking lot", "incentive parking lot", "metro parking lot", "park and pool lot", "park and ride lot", "P+R", "public transport parking lot", "public transit parking lot", "train parking lot"], "name": "Park & Ride Lot"},
     "amenity/parking/underground": {"icon": "maki-car", "fields": ["{amenity/parking}", "layer"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "matchScore": 1.05, "name": "Underground Parking"},
-    "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "email", "fax", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bill pay", "cash", "check", "currency", "finance", "money", "tax pay"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
-    "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["covered", "currency_multi", "indoor", "level", "wheelchair"], "geometry": ["point"], "terms": ["atm", "bill pay", "card", "cash", "ekiosk", "finance", "interactive kiosk", "money transfer", "phone pay", "tax pay"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
-    "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
-    "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor", "level"], "geometry": ["point", "area"], "terms": ["booth", "camera", "kiosk", "photo", "photobooth"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
+    "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
+    "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["covered", "currency_multi", "indoor", "level", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
+    "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["level", "opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
+    "amenity/photo_booth": {"icon": "fas-person-booth", "fields": ["name", "operator", "payment_multi", "wheelchair"], "moreFields": ["brand", "indoor", "level"], "geometry": ["point", "area"], "terms": ["photobooth", "photo", "booth", "kiosk", "camera"], "tags": {"amenity": "photo_booth"}, "name": "Photo Booth"},
     "amenity/place_of_worship": {"icon": "maki-place-of-worship", "fields": ["name", "religion", "denomination", "address", "building_area", "service_times"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/ssid", "level", "opening_hours", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "church", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "mosque", "oratory", "parish", "sacellum", "sanctuary", "shrine", "synagogue", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship"}, "name": "Place of Worship"},
-    "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["dojo", "monastery", "pagoda", "stupa", "temple", "vihara", "zendo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
-    "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "christian", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
+    "amenity/place_of_worship/buddhist": {"icon": "maki-religious-buddhist", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["stupa", "vihara", "monastery", "temple", "pagoda", "zendo", "dojo"], "tags": {"amenity": "place_of_worship", "religion": "buddhist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Buddhist Temple"},
+    "amenity/place_of_worship/christian": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["christian", "abbey", "basilica", "bethel", "cathedral", "chancel", "chantry", "chapel", "fold", "house of God", "house of prayer", "house of worship", "minster", "mission", "oratory", "parish", "sacellum", "sanctuary", "shrine", "tabernacle", "temple"], "tags": {"amenity": "place_of_worship", "religion": "christian"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Christian Church"},
     "amenity/place_of_worship/christian/jehovahs_witness": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "jehovahs_witness"}, "reference": {"key": "denomination", "value": "jehovahs_witness"}, "name": "Kingdom Hall of Jehovah's Witnesses"},
     "amenity/place_of_worship/christian/la_luz_del_mundo": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship", "the light of the world church"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "la_luz_del_mundo"}, "reference": {"key": "denomination", "value": "la_luz_del_mundo"}, "name": "La Luz del Mundo Temple"},
     "amenity/place_of_worship/christian/quaker": {"icon": "maki-place-of-worship", "geometry": ["point", "area"], "terms": ["christian", "church", "house of God", "house of prayer", "house of worship"], "tags": {"amenity": "place_of_worship", "religion": "christian", "denomination": "quaker"}, "reference": {"key": "denomination", "value": "quaker"}, "name": "Quaker Friends Meeting House"},
-    "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["alayam", "devasthana", "kovil", "kshetram", "mandir", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
+    "amenity/place_of_worship/hindu": {"icon": "temaki-hinduism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kovil", "devasthana", "mandir", "kshetram", "alayam", "shrine", "temple"], "tags": {"amenity": "place_of_worship", "religion": "hindu"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Hindu Temple"},
     "amenity/place_of_worship/jewish": {"icon": "maki-religious-jewish", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["jewish"], "tags": {"amenity": "place_of_worship", "religion": "jewish"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Jewish Synagogue"},
     "amenity/place_of_worship/muslim": {"icon": "maki-religious-muslim", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["islam", "islamic center", "muslim"], "tags": {"amenity": "place_of_worship", "religion": "muslim"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Muslim Mosque"},
     "amenity/place_of_worship/shinto": {"icon": "temaki-shinto", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["kami", "torii"], "tags": {"amenity": "place_of_worship", "religion": "shinto"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Shinto Shrine"},
     "amenity/place_of_worship/sikh": {"icon": "temaki-sikhism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["gurudwara", "temple"], "tags": {"amenity": "place_of_worship", "religion": "sikh"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Sikh Temple"},
     "amenity/place_of_worship/taoist": {"icon": "temaki-taoism", "fields": ["name", "religion", "denomination", "{amenity/place_of_worship}"], "geometry": ["point", "area"], "terms": ["daoist", "monastery", "temple"], "tags": {"amenity": "place_of_worship", "religion": "taoist"}, "reference": {"key": "amenity", "value": "place_of_worship"}, "name": "Taoist Temple"},
-    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "email", "fax", "fee", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["astronomy", "museum", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
-    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "enforcement", "fed", "law", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
+    "amenity/planetarium": {"icon": "maki-globe", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["museum", "astronomy", "observatory"], "tags": {"amenity": "planetarium"}, "name": "Planetarium"},
+    "amenity/police": {"icon": "maki-police", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["badge", "constable", "constabulary", "cop", "detective", "fed", "law", "enforcement", "officer", "patrol"], "tags": {"amenity": "police"}, "name": "Police"},
     "amenity/polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"amenity": "polling_station"}, "addTags": {"amenity": "polling_station", "polling_station": "yes"}, "name": "Permanent Polling Place"},
     "amenity/post_box": {"icon": "temaki-post_box", "fields": ["operator", "collection_times", "drive_through", "ref"], "moreFields": ["access_simple", "brand", "covered", "height", "indoor", "level", "manufacturer", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "post_box"}, "terms": ["letter drop", "mail box", "package drop", "post box", "postal box"], "name": "Mailbox"},
     "amenity/post_depot": {"icon": "fas-mail-bulk", "fields": ["name", "operator", "address", "building_area", "phone"], "moreFields": ["email", "fax", "opening_hours", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["mail processing and distribution center", "post depot"], "tags": {"amenity": "post_depot"}, "name": "Post Sorting Office"},
     "amenity/post_office": {"icon": "maki-post", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["letter", "mail"], "tags": {"amenity": "post_office"}, "name": "Post Office"},
-    "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "homework", "math", "reading", "SAT", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
-    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "correction", "jail"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
-    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "beer", "bier", "booze", "dive", "drink"], "name": "Pub"},
-    "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgb pub", "lgbt pub", "lgbtq pub"], "name": "LGBTQ+ Pub"},
-    "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "beer", "bier", "booze", "craft brewery", "dive", "drink", "microbrewery", "small batch brewery"], "name": "Brewpub"},
-    "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["foot bath", "hot springs", "onsen"], "name": "Public Bath"},
-    "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "public_bookcase/type", "operator", "opening_hours", "capacity", "website", "lit"], "moreFields": ["access_simple", "address", "brand", "email", "level", "location", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bookcrossing", "library"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
-    "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["backcountry office", "permit center", "permit centre", "visitor center", "visitor centre", "warden center", "warden office"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
-    "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "operator/type", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["charge_fee", "email", "fax", "fee", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "garbage", "glass", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
-    "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer", "material", "opening_hours"], "geometry": ["point", "area"], "terms": ["bin", "bottle", "can", "garbage", "glass", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
+    "amenity/prep_school": {"icon": "temaki-school", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "terms": ["academic", "ACT", "SAT", "homework", "math", "reading", "test prep", "tutoring", "writing"], "tags": {"amenity": "prep_school"}, "name": "Test Prep / Tutoring School"},
+    "amenity/prison": {"icon": "maki-prison", "fields": ["name", "operator", "operator/type", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["cell", "jail", "correction"], "tags": {"amenity": "prison"}, "name": "Prison Grounds"},
+    "amenity/pub": {"icon": "maki-beer", "fields": ["name", "address", "building_area", "opening_hours", "smoking", "brewery"], "moreFields": ["air_conditioning", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "outdoor_seating", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pub"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze"], "name": "Pub"},
+    "amenity/pub/lgbtq": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "lgbtq": "primary"}, "terms": ["gay pub", "lesbian pub", "lgbtq pub", "lgbt pub", "lgb pub"], "name": "LGBTQ+ Pub"},
+    "amenity/pub/microbrewery": {"icon": "maki-beer", "geometry": ["point", "area"], "tags": {"amenity": "pub", "microbrewery": "yes"}, "reference": {"key": "microbrewery"}, "terms": ["alcohol", "drink", "dive", "beer", "bier", "booze", "craft brewery", "microbrewery", "small batch brewery"], "name": "Brewpub"},
+    "amenity/public_bath": {"icon": "maki-water", "fields": ["name", "bath/type", "bath/open_air", "bath/sand_bath", "address", "building_area", "fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "public_bath"}, "terms": ["onsen", "foot bath", "hot springs"], "name": "Public Bath"},
+    "amenity/public_bookcase": {"icon": "maki-library", "fields": ["name", "public_bookcase/type", "operator", "opening_hours", "capacity", "website", "lit"], "moreFields": ["access_simple", "address", "brand", "email", "level", "location", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["library", "bookcrossing"], "tags": {"amenity": "public_bookcase"}, "name": "Public Bookcase"},
+    "amenity/ranger_station": {"icon": "maki-ranger-station", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["visitor center", "visitor centre", "permit center", "permit centre", "backcountry office", "warden office", "warden center"], "tags": {"amenity": "ranger_station"}, "name": "Ranger Station"},
+    "amenity/recycling_centre": {"icon": "maki-recycling", "fields": ["name", "operator", "operator/type", "address", "building", "opening_hours", "recycling_accepts"], "moreFields": ["charge_fee", "fee", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["bottle", "can", "dump", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "centre"}, "reference": {"key": "recycling_type", "value": "*"}, "name": "Recycling Center"},
+    "amenity/recycling_container": {"icon": "maki-recycling", "fields": ["operator", "recycling_accepts", "collection_times"], "moreFields": ["colour", "covered", "indoor", "level", "manufacturer", "material", "opening_hours"], "geometry": ["point", "area"], "terms": ["bin", "can", "bottle", "glass", "garbage", "rubbish", "scrap", "trash"], "tags": {"amenity": "recycling", "recycling_type": "container"}, "reference": {"key": "amenity", "value": "recycling"}, "name": "Recycling Container"},
     "amenity/recycling/container/electrical_items": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["computers", "electronic waste", "electronics recycling", "ewaste bin", "phones", "tablets"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:electrical_items": "yes"}, "reference": {"key": "recycling:electrical_items", "value": "yes"}, "name": "E-Waste Container"},
-    "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "food scrap", "garbage bin", "garden waste", "organic", "rubbish"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"},
+    "amenity/recycling/container/green_waste": {"icon": "maki-recycling", "fields": ["{amenity/recycling_container}"], "moreFields": ["{amenity/recycling_container}"], "geometry": ["point", "area"], "terms": ["biodegradable", "biological", "compost", "decomposable", "garbage bin", "garden waste", "organic", "rubbish", "food scrap"], "tags": {"amenity": "recycling", "recycling_type": "container", "recycling:green_waste": "yes"}, "reference": {"key": "recycling:green_waste", "value": "yes"}, "name": "Green Waste Container"},
     "amenity/restaurant": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "address", "building_area", "opening_hours", "phone"], "moreFields": ["air_conditioning", "bar", "brewery", "capacity", "delivery", "diet_multi", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "microbrewery", "min_age", "not/name", "outdoor_seating", "reservation", "smoking", "stars", "takeaway", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant"}, "name": "Restaurant"},
     "amenity/restaurant/american": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "coffee", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "american"}, "reference": {"key": "cuisine", "value": "american"}, "name": "American Restaurant"},
     "amenity/restaurant/asian": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "asian"}, "reference": {"key": "cuisine", "value": "asian"}, "name": "Asian Restaurant"},
     "amenity/restaurant/chinese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "chinese"}, "reference": {"key": "cuisine", "value": "chinese"}, "name": "Chinese Restaurant"},
     "amenity/restaurant/french": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "french"}, "reference": {"key": "cuisine", "value": "french"}, "name": "French Restaurant"},
     "amenity/restaurant/german": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "german"}, "reference": {"key": "cuisine", "value": "german"}, "name": "German Restaurant"},
-    "amenity/restaurant/greek": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "gyros", "lunch", "olives", "pitas", "table"], "tags": {"amenity": "restaurant", "cuisine": "greek"}, "reference": {"key": "cuisine", "value": "greek"}, "name": "Greek Restaurant"},
-    "amenity/restaurant/indian": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "curry", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "indian"}, "reference": {"key": "cuisine", "value": "indian"}, "name": "Indian Restaurant"},
-    "amenity/restaurant/italian": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "pasta", "pizza", "table"], "tags": {"amenity": "restaurant", "cuisine": "italian"}, "reference": {"key": "cuisine", "value": "italian"}, "name": "Italian Restaurant"},
+    "amenity/restaurant/greek": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "gyros", "pitas", "olives"], "tags": {"amenity": "restaurant", "cuisine": "greek"}, "reference": {"key": "cuisine", "value": "greek"}, "name": "Greek Restaurant"},
+    "amenity/restaurant/indian": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "curry"], "tags": {"amenity": "restaurant", "cuisine": "indian"}, "reference": {"key": "cuisine", "value": "indian"}, "name": "Indian Restaurant"},
+    "amenity/restaurant/italian": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "pasta", "pizza"], "tags": {"amenity": "restaurant", "cuisine": "italian"}, "reference": {"key": "cuisine", "value": "italian"}, "name": "Italian Restaurant"},
     "amenity/restaurant/japanese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "japanese"}, "reference": {"key": "cuisine", "value": "japanese"}, "name": "Japanese Restaurant"},
-    "amenity/restaurant/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "burritos", "dine", "dining", "dinner", "drive-in", "eat", "enchiladas", "fajitas", "grill", "lunch", "nachos", "quesadillas", "salsa", "table", "tacos", "tamales", "tortillas"], "tags": {"amenity": "restaurant", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Restaurant"},
-    "amenity/restaurant/noodle": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "cellophane noodles", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "ramen noodles", "rice noodles", "soba noodles", "soup", "table"], "tags": {"amenity": "restaurant", "cuisine": "noodle"}, "reference": {"key": "cuisine", "value": "noodle"}, "name": "Noodle Restaurant"},
-    "amenity/restaurant/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["bar", "deep dish", "dine", "dining", "dinner", "drive-in", "eat", "lunch", "slice", "table", "thin crust"], "tags": {"amenity": "restaurant", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Restaurant"},
-    "amenity/restaurant/seafood": {"icon": "maki-restaurant-seafood", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "clams", "crab", "crustaceans", "dine", "dining", "dinner", "drive-in", "eat", "fish", "grill", "lobsters", "lunch", "molluscs", "octopus", "oysters", "shellfish", "shrimp", "squid", "table"], "tags": {"amenity": "restaurant", "cuisine": "seafood"}, "reference": {"key": "cuisine", "value": "seafood"}, "name": "Seafood Restaurant"},
-    "amenity/restaurant/steakhouse": {"icon": "maki-slaughterhouse", "geometry": ["point", "area"], "terms": ["bar", "beef", "breakfast", "cafe", "café", "canteen", "chop house", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "steak house", "table"], "tags": {"amenity": "restaurant", "cuisine": "steak_house"}, "reference": {"key": "cuisine", "value": "steak_house"}, "name": "Steakhouse"},
+    "amenity/restaurant/mexican": {"icon": "fas-pepper-hot", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "tacos", "burritos", "enchiladas", "fajitas", "nachos", "tortillas", "salsa", "tamales", "quesadillas"], "tags": {"amenity": "restaurant", "cuisine": "mexican"}, "reference": {"key": "cuisine", "value": "mexican"}, "name": "Mexican Restaurant"},
+    "amenity/restaurant/noodle": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "ramen noodles", "soup", "soba noodles", "cellophane noodles", "rice noodles"], "tags": {"amenity": "restaurant", "cuisine": "noodle"}, "reference": {"key": "cuisine", "value": "noodle"}, "name": "Noodle Restaurant"},
+    "amenity/restaurant/pizza": {"icon": "maki-restaurant-pizza", "geometry": ["point", "area"], "terms": ["bar", "dine", "dining", "dinner", "drive-in", "eat", "lunch", "table", "deep dish", "thin crust", "slice"], "tags": {"amenity": "restaurant", "cuisine": "pizza"}, "reference": {"key": "cuisine", "value": "pizza"}, "name": "Pizza Restaurant"},
+    "amenity/restaurant/seafood": {"icon": "maki-restaurant-seafood", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "fish", "shellfish", "molluscs", "crustaceans", "clams", "oysters", "lobsters", "crab", "shrimp", "squid", "octopus"], "tags": {"amenity": "restaurant", "cuisine": "seafood"}, "reference": {"key": "cuisine", "value": "seafood"}, "name": "Seafood Restaurant"},
+    "amenity/restaurant/steakhouse": {"icon": "maki-slaughterhouse", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table", "steak house", "chop house", "beef"], "tags": {"amenity": "restaurant", "cuisine": "steak_house"}, "reference": {"key": "cuisine", "value": "steak_house"}, "name": "Steakhouse"},
     "amenity/restaurant/sushi": {"icon": "fas-fish", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "sushi"}, "reference": {"key": "cuisine", "value": "sushi"}, "name": "Sushi Restaurant"},
     "amenity/restaurant/thai": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "thai"}, "reference": {"key": "cuisine", "value": "thai"}, "name": "Thai Restaurant"},
     "amenity/restaurant/turkish": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "turkish"}, "reference": {"key": "cuisine", "value": "turkish"}, "name": "Turkish Restaurant"},
     "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "café", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"},
-    "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["Camper", "CDP", "Chemical Toilet", "CTDP", "Dump Station", "Elsan", "Motor Home", "Sanitary"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
-    "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "high school", "middle school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
-    "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["gazebo", "lean-to", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
+    "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"},
+    "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"},
+    "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"},
     "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"},
     "amenity/shelter/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"},
     "amenity/shelter/picnic_shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"},
     "amenity/shelter/public_transport": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "lit"], "geometry": ["point", "area"], "terms": ["bus stop", "metro stop", "public transit shelter", "public transport shelter", "tram stop shelter", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit Shelter"},
-    "amenity/shower": {"icon": "fas-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "gender", "level", "operator"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
-    "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["covered", "level", "lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
+    "amenity/shower": {"icon": "fas-shower", "fields": ["opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "level", "operator", "gender"], "geometry": ["point", "vertex", "area"], "terms": ["rain closet"], "tags": {"amenity": "shower"}, "name": "Shower"},
+    "amenity/smoking_area": {"icon": "fas-smoking", "fields": ["name", "shelter", "bin", "bench", "opening_hours"], "moreFields": ["level", "lit", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "brand", "operator", "operator/type", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
     "amenity/social_facility": {"icon": "temaki-social_facility", "fields": ["name", "operator", "operator/type", "address", "building_area", "social_facility", "social_facility_for"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "opening_hours", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility"}, "name": "Social Facility"},
     "amenity/social_facility/ambulatory_care": {"icon": "maki-wheelchair", "geometry": ["point", "area"], "tags": {"amenity": "social_facility", "social_facility": "ambulatory_care"}, "reference": {"key": "social_facility", "value": "ambulatory_care"}, "name": "Ambulatory Care"},
     "amenity/social_facility/food_bank": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "social_facility", "social_facility": "food_bank"}, "reference": {"key": "social_facility", "value": "food_bank"}, "name": "Food Bank"},
-    "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["assisted living", "care home", "living", "old", "senior"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"},
-    "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["displaced", "houseless", "unhoused"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"},
-    "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["assisted living", "elderly", "living", "nursing", "old", "senior"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"},
-    "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area", "website"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["radio", "recording", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
+    "amenity/social_facility/group_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["old", "senior", "living", "care home", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "group_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "group_home"}, "name": "Elderly Group Home"},
+    "amenity/social_facility/homeless_shelter": {"icon": "temaki-social_facility", "geometry": ["point", "area"], "terms": ["houseless", "unhoused", "displaced"], "tags": {"amenity": "social_facility", "social_facility": "shelter", "social_facility:for": "homeless"}, "reference": {"key": "social_facility", "value": "shelter"}, "name": "Homeless Shelter"},
+    "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["{amenity/social_facility}", "wheelchair"], "geometry": ["point", "area"], "terms": ["elderly", "living", "nursing", "old", "senior", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"},
+    "amenity/studio": {"icon": "fas-microphone", "fields": ["name", "studio", "address", "building_area", "website"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"},
     "amenity/studio/audio": {"icon": "fas-microphone", "geometry": ["point", "area"], "terms": ["audio mixing", "audio production", "audio recording", "audio studio"], "tags": {"amenity": "studio", "studio": "audio"}, "reference": {"key": "studio", "value": "audio"}, "name": "Recording Studio"},
     "amenity/studio/radio": {"icon": "fas-microphone", "geometry": ["point", "area"], "terms": ["am radio", "fm radio", "radio broadcast", "radio studio"], "tags": {"amenity": "studio", "studio": "radio"}, "reference": {"key": "studio", "value": "radio"}, "name": "Radio Station"},
     "amenity/studio/television": {"icon": "fas-video", "geometry": ["point", "area"], "terms": ["television broadcast", "television studio", "tv broadcast", "tv station", "tv studio"], "tags": {"amenity": "studio", "studio": "television"}, "reference": {"key": "studio", "value": "television"}, "name": "Television Station"},
     "amenity/studio/video": {"icon": "fas-video", "geometry": ["point", "area"], "terms": ["movie production", "movie studio", "video production", "video recording", "video studio"], "tags": {"amenity": "studio", "studio": "video"}, "reference": {"key": "studio", "value": "video"}, "name": "Film Studio"},
     "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity", "address"], "moreFields": ["access_simple", "brand", "opening_hours", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"},
     "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi_fee", "charge_fee", "booth"], "moreFields": ["covered", "indoor", "level", "lit", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"},
-    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["musical", "performance", "play", "theatre"], "tags": {"amenity": "theatre"}, "name": "Theater"},
-    "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["ampi", "greek", "open air", "outdoor"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
-    "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "latrine", "lavatory", "outhouse", "privy", "restroom", "W.C.", "water closet", "WC"], "tags": {"amenity": "toilets"}, "name": "Toilets"},
-    "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "W.C.", "water closet", "WC"], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
+    "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area", "website"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "min_age", "payment_multi", "phone", "wheelchair"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"},
+    "amenity/theatre/type/amphi": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["open air", "outdoor", "greek", "ampi"], "tags": {"amenity": "theatre", "theatre:type": "amphi"}, "name": "Amphitheatre"},
+    "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "access_simple", "gender", "changing_table", "wheelchair", "building_area"], "moreFields": ["charge_fee", "fee", "level", "opening_hours", "operator", "payment_multi_fee", "toilets/handwashing", "toilets/position"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"},
+    "amenity/toilets/disposal/flush": {"icon": "fas-toilet", "fields": ["toilets/disposal", "{amenity/toilets}"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "head", "lavatory", "privy", "restroom", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets", "toilets:disposal": "flush"}, "reference": {"key": "toilets:disposal", "value": "flush"}, "name": "Flush Toilets"},
     "amenity/toilets/disposal/pitlatrine": {"icon": "tnp-2009541", "fields": ["toilets/disposal", "{amenity/toilets}", "toilets/handwashing"], "moreFields": ["{amenity/toilets}"], "geometry": ["point", "vertex", "area"], "terms": ["head", "lavatory", "long drop", "outhouse", "pit toilet", "privy"], "tags": {"amenity": "toilets", "toilets:disposal": "pitlatrine"}, "reference": {"key": "toilets:disposal", "value": "pitlatrine"}, "name": "Pit Latrine"},
-    "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["city", "courthouse", "government", "municipal", "village"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
+    "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["email", "fax", "phone", "polling_station", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"},
     "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"},
-    "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "master's degree program", "PhD program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
+    "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"},
     "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"},
     "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["blind", "brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"},
     "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return Machine"},
     "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "moreFields": ["{amenity/vending_machine}", "min_age"], "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"},
     "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"},
     "amenity/vending_machine/condoms": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"},
-    "amenity/vending_machine/drinks": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["beverage", "drink", "juice", "pop", "soda"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"},
+    "amenity/vending_machine/drinks": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["drink", "soda", "beverage", "juice", "pop"], "tags": {"amenity": "vending_machine", "vending": "drinks"}, "reference": {"key": "vending", "value": "drinks"}, "name": "Drink Vending Machine"},
     "amenity/vending_machine/electronics": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["cable", "charger", "earbud", "headphone", "phone", "tablet"], "tags": {"amenity": "vending_machine", "vending": "electronics"}, "reference": {"key": "vending", "value": "electronics"}, "name": "Electronics Vending Machine"},
     "amenity/vending_machine/elongated_coin": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coin", "crush", "elongated", "flatten", "penny", "souvenir"], "tags": {"amenity": "vending_machine", "vending": "elongated_coin"}, "reference": {"key": "vending", "value": "elongated_coin"}, "name": "Flat Coin Vending Machine"},
-    "amenity/vending_machine/excrement_bags": {"icon": "temaki-vending_machine", "fields": ["{amenity/vending_machine}"], "geometry": ["point"], "terms": ["animal", "dog", "excrement bags", "poop", "waste"], "tags": {"amenity": "vending_machine", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "name": "Excrement Bag Dispenser"},
-    "amenity/vending_machine/feminine_hygiene": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom", "menstrual hygiene products", "pad", "personal care", "tampon", "woman", "women"], "tags": {"amenity": "vending_machine", "vending": "feminine_hygiene"}, "reference": {"key": "vending", "value": "feminine_hygiene"}, "name": "Feminine Hygiene Vending Machine"},
+    "amenity/vending_machine/excrement_bags": {"icon": "temaki-vending_machine", "fields": ["{amenity/vending_machine}"], "geometry": ["point"], "terms": ["excrement bags", "poop", "waste", "dog", "animal"], "tags": {"amenity": "vending_machine", "vending": "excrement_bags"}, "reference": {"key": "vending", "value": "excrement_bags"}, "name": "Excrement Bag Dispenser"},
+    "amenity/vending_machine/feminine_hygiene": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom", "tampon", "pad", "woman", "women", "menstrual hygiene products", "personal care"], "tags": {"amenity": "vending_machine", "vending": "feminine_hygiene"}, "reference": {"key": "vending", "value": "feminine_hygiene"}, "name": "Feminine Hygiene Vending Machine"},
     "amenity/vending_machine/food": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["food"], "tags": {"amenity": "vending_machine", "vending": "food"}, "reference": {"key": "vending", "value": "food"}, "name": "Food Vending Machine"},
-    "amenity/vending_machine/fuel": {"icon": "maki-fuel", "geometry": ["point"], "terms": ["biodiesel", "cng", "diesel", "fuel", "gasoline", "lng", "petrol", "propane"], "tags": {"amenity": "vending_machine", "vending": "fuel"}, "reference": {"key": "vending", "value": "fuel"}, "name": "Gas Pump", "matchScore": 0.5},
-    "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["chocolate", "frozen", "ice cream", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"},
+    "amenity/vending_machine/fuel": {"icon": "maki-fuel", "geometry": ["point"], "terms": ["petrol", "fuel", "gasoline", "propane", "diesel", "lng", "cng", "biodiesel"], "tags": {"amenity": "vending_machine", "vending": "fuel"}, "reference": {"key": "vending", "value": "fuel"}, "name": "Gas Pump", "matchScore": 0.5},
+    "amenity/vending_machine/ice_cream": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["chocolate", "ice cream", "frozen", "popsicle", "vanilla"], "tags": {"amenity": "vending_machine", "vending": "ice_cream"}, "reference": {"key": "vending", "value": "ice_cream"}, "name": "Ice Cream Vending Machine"},
     "amenity/vending_machine/newspapers": {"icon": "far-newspaper", "fields": ["vending", "operator", "fee", "payment_multi_fee", "charge_fee", "currency_multi"], "geometry": ["point"], "terms": ["newspaper"], "tags": {"amenity": "vending_machine", "vending": "newspapers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine"},
     "amenity/vending_machine/parcel_pickup_dropoff": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": ["mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup;parcel_mail_in"}, "reference": {"key": "vending", "value": "parcel_pickup;parcel_mail_in"}, "name": "Parcel Pickup/Dropoff Locker"},
     "amenity/vending_machine/parcel_pickup": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["amazon", "locker", "mail", "parcel", "pickup"], "tags": {"amenity": "vending_machine", "vending": "parcel_pickup"}, "reference": {"key": "vending", "value": "parcel_pickup"}, "name": "Parcel Pickup Locker"},
     "amenity/vending_machine/parking_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["parking", "ticket"], "tags": {"amenity": "vending_machine", "vending": "parking_tickets"}, "reference": {"key": "vending", "value": "parking_tickets"}, "matchScore": 0.94, "name": "Parking Ticket Vending Machine"},
-    "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["bus", "ferry", "rail", "ticket", "train", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
+    "amenity/vending_machine/public_transport_tickets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["bus", "train", "ferry", "rail", "ticket", "transportation"], "tags": {"amenity": "vending_machine", "vending": "public_transport_tickets"}, "reference": {"key": "vending", "value": "public_transport_tickets"}, "name": "Transit Ticket Vending Machine"},
     "amenity/vending_machine/stamps": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["mail", "postage", "stamp"], "tags": {"amenity": "vending_machine", "vending": "stamps"}, "reference": {"key": "vending", "value": "stamps"}, "name": "Postage Vending Machine"},
-    "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["candy", "chip", "cookie", "cracker", "gum", "pretzel"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"},
-    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "level", "payment_multi_fee", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal hospital", "pet clinic", "pet doctor", "veterinarian"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
-    "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "litter", "rubbish", "trash"], "name": "Waste Basket"},
-    "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "litter", "rubbish", "trash"], "name": "Garbage Dumpster"},
+    "amenity/vending_machine/sweets": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["candy", "gum", "chip", "pretzel", "cookie", "cracker"], "tags": {"amenity": "vending_machine", "vending": "sweets"}, "reference": {"key": "vending", "value": "sweets"}, "name": "Snack Vending Machine"},
+    "amenity/veterinary": {"icon": "temaki-veterinary_care", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "fee", "level", "payment_multi_fee", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["pet clinic", "veterinarian", "animal hospital", "pet doctor"], "tags": {"amenity": "veterinary"}, "name": "Veterinary"},
+    "amenity/waste_basket": {"icon": "maki-waste-basket", "fields": ["operator", "waste", "collection_times", "material", "colour"], "moreFields": ["covered", "indoor", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"amenity": "waste_basket"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash"], "name": "Waste Basket"},
+    "amenity/waste_disposal": {"icon": "fas-dumpster", "fields": ["operator", "waste", "collection_times", "access_simple"], "moreFields": ["brand", "colour", "height", "manufacturer", "material"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_disposal"}, "terms": ["garbage", "rubbish", "litter", "trash"], "name": "Garbage Dumpster"},
     "amenity/waste_transfer_station": {"icon": "maki-waste-basket", "fields": ["name", "operator", "operator/type", "waste", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["dump", "garbage", "recycling", "rubbish", "scrap", "trash"], "tags": {"amenity": "waste_transfer_station"}, "name": "Waste Transfer Station"},
-    "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "dog", "garbage", "litter", "poo", "rubbish", "trash"], "name": "Dog Excrement Bin"},
+    "amenity/waste/dog_excrement": {"icon": "maki-waste-basket", "fields": ["collection_times"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "waste_basket", "waste": "dog_excrement"}, "reference": {"key": "waste", "value": "dog_excrement"}, "terms": ["bin", "garbage", "rubbish", "litter", "trash", "poo", "dog"], "name": "Dog Excrement Bin"},
     "amenity/water_point": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "water_point"}, "name": "RV Drinking Water"},
     "amenity/watering_place": {"icon": "maki-drinking-water", "fields": ["operator", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "geometry": ["area", "vertex", "point"], "tags": {"amenity": "watering_place"}, "name": "Animal Watering Place"},
     "amenity/weighbridge": {"icon": "fas-weight", "fields": ["ref", "operator", "access_simple", "maxweight"], "moreFields": ["address", "colour", "lit", "manufacturer", "material", "wheelchair"], "geometry": ["point", "vertex"], "terms": ["weigh station", "weighbridge"], "tags": {"amenity": "weighbridge"}, "name": "Truck Scale"},
     "area": {"fields": ["name"], "geometry": ["area"], "tags": {"area": "yes"}, "terms": ["polygon"], "name": "Area", "matchScore": 0.1},
     "area/highway": {"fields": ["name", "area/highway", "surface"], "geometry": ["area"], "terms": ["area:highway", "edge of pavement", "highway area", "highway shape", "pavement", "road shape", "street area"], "tags": {"area:highway": "*"}, "name": "Road Surface"},
-    "attraction/amusement_ride": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["carnival ride", "theme park"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"},
+    "attraction/amusement_ride": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "carnival ride"], "tags": {"attraction": "amusement_ride"}, "name": "Amusement Ride"},
     "attraction/animal": {"icon": "maki-zoo", "fields": ["name", "operator", "species/wikidata"], "geometry": ["point", "area"], "terms": ["amphibian", "animal park", "aquarium", "bear", "bird", "fish", "insect", "lion", "mammal", "monkey", "penguin", "reptile", "safari", "theme park", "tiger", "zoo"], "tags": {"attraction": "animal"}, "name": "Animal Enclosure"},
-    "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["amusement ride", "ferris wheel", "theme park"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
-    "attraction/bumper_car": {"icon": "fas-car-crash", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["autoscooter", "dodgem cars", "theme park"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Cars"},
-    "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["bungy jumping", "jumping platform", "theme park"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
-    "attraction/carousel": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["flying horses", "galloper", "horseabout", "jumper", "merry-go-round", "roundabout", "theme park"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
-    "attraction/dark_ride": {"icon": "maki-rail-metro", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line", "area"], "terms": ["ghost train", "theme park"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
-    "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["amusement ride", "big drop", "gondola", "theme park", "tower"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"},
-    "attraction/maze": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["amusement ride", "labyrinth", "theme park"], "tags": {"attraction": "maze"}, "name": "Maze"},
-    "attraction/pirate_ship": {"icon": "maki-danger", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["amusement ride", "carnival ride", "theme park"], "tags": {"attraction": "pirate_ship"}, "name": "Pirate Ship"},
-    "attraction/river_rafting": {"icon": "maki-ferry", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line"], "terms": ["aquatic park", "rafting simulator", "river rafting ride", "river rapids ride", "theme park", "water park"], "tags": {"attraction": "river_rafting"}, "name": "River Rafting"},
-    "attraction/roller_coaster": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["amusement ride", "theme park"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"},
+    "attraction/big_wheel": {"icon": "maki-amusement-park", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["ferris wheel", "theme park", "amusement ride"], "tags": {"attraction": "big_wheel"}, "name": "Big Wheel"},
+    "attraction/bumper_car": {"icon": "fas-car-crash", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "dodgem cars", "autoscooter"], "tags": {"attraction": "bumper_car"}, "name": "Bumper Cars"},
+    "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
+    "attraction/carousel": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
+    "attraction/dark_ride": {"icon": "maki-rail-metro", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
+    "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"},
+    "attraction/maze": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"},
+    "attraction/pirate_ship": {"icon": "maki-danger", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "terms": ["theme park", "carnival ride", "amusement ride"], "tags": {"attraction": "pirate_ship"}, "name": "Pirate Ship"},
+    "attraction/river_rafting": {"icon": "maki-ferry", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line"], "terms": ["theme park", "aquatic park", "water park", "rafting simulator", "river rafting ride", "river rapids ride"], "tags": {"attraction": "river_rafting"}, "name": "River Rafting"},
+    "attraction/roller_coaster": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride"], "tags": {"attraction": "roller_coaster"}, "name": "Roller Coaster"},
     "attraction/summer_toboggan": {"icon": "temaki-sledding", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line"], "terms": ["alpine slide", "mountain coaster"], "tags": {"attraction": "summer_toboggan"}, "name": "Summer Toboggan"},
-    "attraction/train": {"icon": "maki-rail", "fields": ["{attraction}", "fee", "charge_fee"], "geometry": ["point", "line"], "terms": ["dotto train", "park train", "rackless train", "road train", "theme park", "Tschu-Tschu train"], "tags": {"attraction": "train"}, "name": "Tourist Train"},
-    "attraction/water_slide": {"icon": "fas-swimmer", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line", "area"], "terms": ["aquatic park", "flumes", "hydroslides", "theme park", "water chutes", "water park"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"},
+    "attraction/train": {"icon": "maki-rail", "fields": ["{attraction}", "fee", "charge_fee"], "geometry": ["point", "line"], "terms": ["theme park", "rackless train", "road train", "Tschu-Tschu train", "dotto train", "park train"], "tags": {"attraction": "train"}, "name": "Tourist Train"},
+    "attraction/water_slide": {"icon": "fas-swimmer", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["line", "area"], "terms": ["theme park", "aquatic park", "water park", "flumes", "water chutes", "hydroslides"], "tags": {"attraction": "water_slide"}, "name": "Water Slide"},
     "barrier": {"icon": "maki-roadblock", "geometry": ["point", "vertex", "line", "area"], "tags": {"barrier": "*"}, "fields": ["barrier"], "moreFields": ["level"], "name": "Barrier", "matchScore": 0.4},
     "barrier/entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"barrier": "entrance"}, "name": "Entrance", "searchable": false},
     "barrier/block": {"icon": "maki-roadblock", "fields": ["access", "material"], "geometry": ["point", "vertex"], "tags": {"barrier": "block"}, "name": "Block"},
     "barrier/bollard_line": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "material", "colour"], "geometry": ["line"], "tags": {"barrier": "bollard"}, "name": "Bollard Row"},
     "barrier/bollard": {"icon": "temaki-silo", "fields": ["access", "bollard", "height", "width", "material", "colour"], "geometry": ["point", "vertex"], "tags": {"barrier": "bollard"}, "name": "Bollard"},
-    "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
+    "barrier/border_control": {"icon": "maki-roadblock", "fields": ["access", "building_area"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "border_control"}, "name": "Border Control"},
     "barrier/cattle_grid": {"icon": "maki-barrier", "geometry": ["vertex"], "tags": {"barrier": "cattle_grid"}, "name": "Cattle Grid"},
     "barrier/chain": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "chain"}, "name": "Chain"},
     "barrier/city_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "city_wall"}, "name": "City Wall"},
     "barrier/cycle_barrier": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "cycle_barrier"}, "name": "Cycle Barrier"},
     "barrier/ditch": {"icon": "maki-roadblock", "geometry": ["line", "area"], "tags": {"barrier": "ditch"}, "name": "Trench", "matchScore": 0.25},
     "barrier/fence": {"icon": "maki-fence", "fields": ["fence_type", "height", "material"], "geometry": ["line"], "tags": {"barrier": "fence"}, "name": "Fence", "matchScore": 0.25},
-    "barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["guard rail", "handrail", "railing"], "name": "Railing", "matchScore": 0.5},
+    "barrier/fence/railing": {"icon": "temaki-railing", "geometry": ["line"], "tags": {"barrier": "fence", "fence_type": "railing"}, "terms": ["railing", "handrail", "guard rail"], "name": "Railing", "matchScore": 0.5},
     "barrier/gate": {"icon": "maki-barrier", "fields": ["access", "opening_hours"], "geometry": ["vertex", "line"], "tags": {"barrier": "gate"}, "name": "Gate"},
-    "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["Armco barrier", "crash barrier", "guardrail", "median barrier", "roadside barrier", "traffic barrier"], "matchScore": 0.75},
+    "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/height_restrictor": {"icon": "temaki-car_wash", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"},
     "barrier/kerb": {"icon": "temaki-kerb-raised", "fields": ["kerb", "tactile_paving", "wheelchair"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "matchScore": 0.5, "name": "Curb"},
     "barrier/kerb/flush": {"icon": "temaki-kerb-flush", "fields": ["kerb", "{barrier/kerb}"], "geometry": ["vertex", "line"], "tags": {"kerb": "flush"}, "addTags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "matchScore": 0.55, "name": "Flush Curb"},
-    "barrier/kerb/lowered": {"icon": "temaki-kerb-lowered", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "lowered"}, "addTags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "dropped kerb", "kerb ramp", "pram ramp"], "matchScore": 0.55, "name": "Lowered Curb"},
+    "barrier/kerb/lowered": {"icon": "temaki-kerb-lowered", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "lowered"}, "addTags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "matchScore": 0.55, "name": "Lowered Curb"},
     "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "matchScore": 0.55, "name": "Raised Curb"},
     "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "matchScore": 0.55, "name": "Rolled Curb"},
     "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
     "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
-    "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["castle side gate", "Postern"], "name": "Sally Port"},
+    "barrier/sally_port": {"icon": "fas-dungeon", "geometry": ["vertex"], "tags": {"barrier": "sally_port"}, "terms": ["Postern", "castle side gate"], "name": "Sally Port"},
     "barrier/stile": {"icon": "maki-roadblock", "fields": ["access", "stile", "material"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
     "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "email", "fax", "opening_hours", "phone", "website"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
     "barrier/turnstile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "terms": ["baffle gate", "turnstyle"], "tags": {"barrier": "turnstile"}, "name": "Turnstile"},
@@ -314,16 +314,16 @@
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support", "height", "layer", "material"], "moreFields": ["colour", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support", "{bridge/support}"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
-    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "layer", "not/name", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
+    "building": {"icon": "maki-home", "fields": ["name", "building", "levels", "height", "address"], "moreFields": ["architect", "building/levels/underground", "building/material", "not/name", "layer", "operator", "roof/colour", "smoking", "wheelchair"], "geometry": ["area"], "tags": {"building": "*"}, "matchScore": 0.6, "terms": [], "name": "Building"},
     "building/bunker": {"geometry": ["area"], "tags": {"building": "bunker"}, "matchScore": 0.5, "name": "Bunker", "searchable": false},
     "building/entrance": {"icon": "maki-entrance-alt1", "fields": [], "moreFields": [], "geometry": ["vertex"], "tags": {"building": "entrance"}, "name": "Entrance/Exit", "searchable": false},
     "building/train_station": {"icon": "maki-building", "geometry": ["point", "vertex", "area"], "tags": {"building": "train_station"}, "matchScore": 0.5, "name": "Train Station Building", "searchable": false},
     "building/apartments": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "apartments"}, "matchScore": 0.5, "name": "Apartment Building"},
     "building/barn": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "barn"}, "matchScore": 0.5, "name": "Barn"},
     "building/boathouse": {"icon": "maki-harbor", "geometry": ["area"], "tags": {"building": "boathouse"}, "matchScore": 0.5, "terms": [], "name": "Boathouse"},
-    "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["detached", "home"], "matchScore": 0.5, "name": "Bungalow"},
+    "building/bungalow": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "bungalow"}, "terms": ["home", "detached"], "matchScore": 0.5, "name": "Bungalow"},
     "building/cabin": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "cabin"}, "matchScore": 0.5, "name": "Cabin"},
-    "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["car", "covered parking space", "garage", "porch"], "name": "Carport"},
+    "building/carport": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "carport"}, "matchScore": 0.5, "terms": ["covered parking space", "garage", "car", "porch"], "name": "Carport"},
     "building/cathedral": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "cathedral"}, "matchScore": 0.5, "name": "Cathedral Building"},
     "building/chapel": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "chapel"}, "matchScore": 0.5, "name": "Chapel Building"},
     "building/church": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "church"}, "matchScore": 0.5, "name": "Church Building"},
@@ -331,19 +331,19 @@
     "building/college": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["university"], "tags": {"building": "college"}, "matchScore": 0.5, "name": "College Building"},
     "building/commercial": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "commercial"}, "matchScore": 0.5, "name": "Commercial Building"},
     "building/construction": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "construction"}, "matchScore": 0.5, "name": "Building Under Construction"},
-    "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["dwelling", "family", "home", "residence", "single"], "matchScore": 0.5, "name": "Detached House"},
+    "building/detached": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "detached"}, "terms": ["home", "single", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Detached House"},
     "building/dormitory": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "dormitory"}, "matchScore": 0.5, "name": "Dormitory"},
     "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "matchScore": 0.5, "name": "Farm Building"},
     "building/farm": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm"}, "matchScore": 0.5, "name": "Farm House"},
     "building/garage": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garage"}, "matchScore": 0.5, "name": "Garage"},
     "building/garages": {"icon": "fas-warehouse", "fields": ["{building}", "capacity"], "geometry": ["area"], "tags": {"building": "garages"}, "matchScore": 0.5, "name": "Garages"},
-    "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["bleachers", "stand", "stands", "tribune"], "matchScore": 0.5, "name": "Grandstand"},
+    "building/grandstand": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "grandstand"}, "terms": ["tribune", "stand", "stands", "bleachers"], "matchScore": 0.5, "name": "Grandstand"},
     "building/greenhouse": {"icon": "maki-garden-centre", "geometry": ["area"], "tags": {"building": "greenhouse"}, "matchScore": 0.5, "name": "Greenhouse"},
     "building/hangar": {"icon": "fas-warehouse", "fields": ["name"], "geometry": ["area"], "tags": {"building": "hangar"}, "matchScore": 0.5, "name": "Hangar Building"},
     "building/hospital": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "hospital"}, "matchScore": 0.5, "name": "Hospital Building"},
     "building/hotel": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "hotel"}, "matchScore": 0.5, "name": "Hotel Building"},
-    "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["dwelling", "family", "home", "residence"], "matchScore": 0.5, "name": "House"},
-    "building/houseboat": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "houseboat"}, "terms": ["dwelling", "family", "home", "residence"], "matchScore": 0.5, "name": "Houseboat"},
+    "building/house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "house"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "House"},
+    "building/houseboat": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "houseboat"}, "terms": ["home", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Houseboat"},
     "building/hut": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "hut"}, "matchScore": 0.5, "name": "Hut"},
     "building/industrial": {"icon": "maki-industry", "geometry": ["area"], "tags": {"building": "industrial"}, "matchScore": 0.5, "name": "Industrial Building"},
     "building/kindergarten": {"icon": "maki-building", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool/Kindergarten Building"},
@@ -354,19 +354,19 @@
     "building/retail": {"icon": "maki-commercial", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "retail"}, "matchScore": 0.5, "name": "Retail Building"},
     "building/roof": {"icon": "maki-shelter", "fields": ["{building}", "layer"], "geometry": ["area"], "tags": {"building": "roof"}, "matchScore": 0.5, "name": "Roof"},
     "building/ruins": {"icon": "temaki-ruins", "geometry": ["area"], "tags": {"building": "ruins"}, "matchScore": 0.5, "name": "Building Ruins"},
-    "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "high school", "middle school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
-    "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["double", "duplex", "dwelling", "family", "home", "residence", "twin"], "matchScore": 0.5, "name": "Semi-Detached House"},
+    "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"},
+    "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"},
     "building/service": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"},
     "building/shed": {"icon": "maki-home", "fields": ["{building}", "lockable"], "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"},
     "building/stable": {"icon": "maki-horse-riding", "geometry": ["area"], "tags": {"building": "stable"}, "matchScore": 0.5, "name": "Stable"},
     "building/stadium": {"icon": "maki-stadium", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "stadium"}, "matchScore": 0.5, "name": "Stadium Building"},
     "building/static_caravan": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "static_caravan"}, "matchScore": 0.5, "name": "Static Mobile Home"},
     "building/temple": {"icon": "maki-place-of-worship", "geometry": ["area"], "tags": {"building": "temple"}, "matchScore": 0.5, "name": "Temple Building"},
-    "building/terrace": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "terrace"}, "terms": ["brownstone", "dwelling", "family", "home", "residence", "terrace"], "matchScore": 0.5, "name": "Row Houses"},
+    "building/terrace": {"icon": "maki-building", "geometry": ["area"], "tags": {"building": "terrace"}, "terms": ["home", "terrace", "brownstone", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Row Houses"},
     "building/transportation": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "transportation"}, "matchScore": 0.5, "name": "Transportation Building"},
     "building/university": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["college"], "tags": {"building": "university"}, "matchScore": 0.5, "name": "University Building"},
     "building/warehouse": {"icon": "maki-warehouse", "geometry": ["area"], "tags": {"building": "warehouse"}, "matchScore": 0.5, "name": "Warehouse"},
-    "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
+    "club": {"icon": "fas-handshake", "fields": ["name", "club", "operator", "address", "building_area", "opening_hours"], "moreFields": ["access_simple", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"club": "*"}, "terms": ["social"], "name": "Club"},
     "club/sport": {"icon": "maki-pitch", "fields": ["name", "sport", "{club}"], "geometry": ["point", "area"], "tags": {"club": "sport"}, "terms": ["athletics club", "sporting club", "sports association", "sports society"], "name": "Sports Club"},
     "craft": {"icon": "temaki-tools", "fields": ["name", "craft", "operator", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "product", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"craft": "*"}, "terms": [], "name": "Craft"},
     "craft/jeweler": {"icon": "maki-marker-stroked", "geometry": ["point", "area"], "tags": {"craft": "jeweler"}, "reference": {"key": "shop", "value": "jewelry"}, "name": "Jeweler", "searchable": false, "replacement": "shop/jewelry"},
@@ -385,16 +385,16 @@
     "craft/caterer": {"icon": "maki-restaurant", "fields": ["name", "cuisine", "{craft}"], "geometry": ["point", "area"], "tags": {"craft": "caterer"}, "name": "Caterer"},
     "craft/chimney_sweeper": {"icon": "temaki-chimney", "geometry": ["point", "area"], "tags": {"craft": "chimney_sweeper"}, "name": "Chimney Sweeper"},
     "craft/clockmaker": {"icon": "temaki-clock", "geometry": ["point", "area"], "tags": {"craft": "clockmaker"}, "name": "Clockmaker"},
-    "craft/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["candy", "sweet"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"},
-    "craft/distillery": {"icon": "temaki-storage_tank", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "booze", "bourbon", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
+    "craft/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet", "candy"], "tags": {"craft": "confectionery"}, "name": "Candy Maker"},
+    "craft/distillery": {"icon": "temaki-storage_tank", "fields": ["{craft}", "product"], "moreFields": ["{craft}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beverage", "bourbon", "booze", "brandy", "gin", "hooch", "liquor", "mezcal", "moonshine", "rum", "scotch", "spirits", "still", "tequila", "vodka", "whiskey", "whisky"], "tags": {"craft": "distillery"}, "name": "Distillery"},
     "craft/dressmaker": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["seamstress"], "tags": {"craft": "dressmaker"}, "name": "Dressmaker"},
     "craft/electrician": {"icon": "temaki-power", "geometry": ["point", "area"], "terms": ["power", "wire"], "tags": {"craft": "electrician"}, "name": "Electrician"},
     "craft/electronics_repair": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "electronics_repair"}, "name": "Electronics Repair Shop"},
     "craft/floorer": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "floorer"}, "name": "Floorer"},
-    "craft/gardener": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["grounds keeper", "landscaper"], "tags": {"craft": "gardener"}, "name": "Gardener"},
+    "craft/gardener": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscaper", "grounds keeper"], "tags": {"craft": "gardener"}, "name": "Gardener"},
     "craft/glaziery": {"icon": "temaki-window", "geometry": ["point", "area"], "terms": ["glass", "stained-glass", "window"], "tags": {"craft": "glaziery"}, "name": "Glaziery"},
     "craft/handicraft": {"icon": "maki-art-gallery", "geometry": ["point", "area"], "tags": {"craft": "handicraft"}, "name": "Handicraft"},
-    "craft/hvac": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["air conditioning", "heat*", "vent*"], "tags": {"craft": "hvac"}, "name": "HVAC"},
+    "craft/hvac": {"icon": "temaki-tools", "geometry": ["point", "area"], "terms": ["heat*", "vent*", "air conditioning"], "tags": {"craft": "hvac"}, "name": "HVAC"},
     "craft/insulator": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "insulation"}, "name": "Insulator"},
     "craft/joiner": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"craft": "joiner"}, "terms": ["furniture"], "name": "Joiner"},
     "craft/key_cutter": {"icon": "fas-key", "geometry": ["point", "area"], "tags": {"craft": "key_cutter"}, "name": "Key Cutter"},
@@ -428,21 +428,21 @@
     "emergency/official": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "official"}, "terms": [], "name": "Emergency Access Official", "searchable": false, "matchScore": 0.01},
     "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "terms": [], "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
     "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "terms": [], "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
-    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
+    "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
     "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
     "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
     "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
     "emergency/fire_hose": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"},
-    "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/diameter", "fire_hydrant/pressure", "level", "survey/date", "water_volume"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
+    "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["ref", "fire_hydrant/type", "colour", "water_source", "couplings"], "moreFields": ["fire_hydrant/pressure", "fire_hydrant/diameter", "level", "water_volume", "survey/date"], "geometry": ["point", "vertex"], "terms": ["fire plug", "fire water well", "hydrant"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"},
     "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"},
-    "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["kisbie ring", "kisby ring", "life buoy", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"},
+    "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"},
     "emergency/lifeguard": {"icon": "fas-life-ring", "fields": ["ref", "operator", "building_area", "opening_hours"], "geometry": ["point", "area"], "terms": ["CPR", "rescue"], "tags": {"emergency": "lifeguard"}, "name": "Lifeguard"},
     "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"},
     "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"},
-    "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["cistern", "reservoir", "water tank"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
-    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["door", "entrance", "exit"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "level", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
+    "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
+    "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "level", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
     "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
-    "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["bunker", "hazard"], "name": "Sand Trap"},
+    "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"},
     "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"},
     "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range"}, "addTags": {"golf": "driving_range", "landuse": "grass"}, "name": "Driving Range"},
     "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway"}, "addTags": {"golf": "fairway", "landuse": "grass"}, "name": "Fairway"},
@@ -453,20 +453,20 @@
     "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough"}, "addTags": {"golf": "rough", "landuse": "grass"}, "name": "Rough"},
     "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee"}, "addTags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "name": "Tee Box"},
     "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard"}, "addTags": {"golf": "water_hazard", "natural": "water"}, "name": "Water Hazard"},
-    "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["brand", "building/levels_building", "email", "fax", "height_building", "level", "opening_hours", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "disease", "doctor", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
+    "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["building/levels_building", "height_building", "opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "level", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
     "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"},
     "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"},
     "healthcare/audiologist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["ear", "hearing", "sound"], "tags": {"healthcare": "audiologist"}, "name": "Audiologist"},
-    "healthcare/birthing_center": {"icon": "fas-baby", "geometry": ["point", "area"], "terms": ["baby", "childbirth", "delivery", "labor", "labour", "pregnancy"], "tags": {"healthcare": "birthing_center"}, "name": "Birthing Center"},
-    "healthcare/blood_donation": {"icon": "maki-blood-bank", "fields": ["{healthcare}", "blood_components"], "geometry": ["point", "area"], "terms": ["apheresis", "blood bank", "blood donation", "blood transfusion", "plasmapheresis", "plateletpheresis", "stem cell donation"], "tags": {"healthcare": "blood_donation"}, "name": "Blood Donor Center"},
+    "healthcare/birthing_center": {"icon": "fas-baby", "geometry": ["point", "area"], "terms": ["baby", "childbirth", "delivery", "labour", "labor", "pregnancy"], "tags": {"healthcare": "birthing_center"}, "name": "Birthing Center"},
+    "healthcare/blood_donation": {"icon": "maki-blood-bank", "fields": ["{healthcare}", "blood_components"], "geometry": ["point", "area"], "terms": ["blood bank", "blood donation", "blood transfusion", "apheresis", "plasmapheresis", "plateletpheresis", "stem cell donation"], "tags": {"healthcare": "blood_donation"}, "name": "Blood Donor Center"},
     "healthcare/counselling": {"icon": "fas-comments", "geometry": ["point", "area"], "tags": {"healthcare": "counselling"}, "name": "Counselling Center"},
-    "healthcare/hospice": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["illness", "terminal"], "tags": {"healthcare": "hospice"}, "name": "Hospice"},
-    "healthcare/laboratory": {"icon": "fas-vial", "fields": ["name", "operator", "website", "ref", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["blood_check", "medical_lab", "medical_laboratory"], "tags": {"healthcare": "laboratory"}, "name": "Medical Laboratory"},
-    "healthcare/midwife": {"icon": "fas-baby", "geometry": ["point", "area"], "terms": ["baby", "childbirth", "delivery", "labor", "labour", "pregnancy"], "tags": {"healthcare": "midwife"}, "name": "Midwife"},
+    "healthcare/hospice": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["terminal", "illness"], "tags": {"healthcare": "hospice"}, "name": "Hospice"},
+    "healthcare/laboratory": {"icon": "fas-vial", "fields": ["name", "operator", "website", "ref", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["medical_laboratory", "medical_lab", "blood_check"], "tags": {"healthcare": "laboratory"}, "name": "Medical Laboratory"},
+    "healthcare/midwife": {"icon": "fas-baby", "geometry": ["point", "area"], "terms": ["baby", "childbirth", "delivery", "labour", "labor", "pregnancy"], "tags": {"healthcare": "midwife"}, "name": "Midwife"},
     "healthcare/occupational_therapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["therapist", "therapy"], "tags": {"healthcare": "occupational_therapist"}, "name": "Occupational Therapist"},
     "healthcare/optometrist": {"icon": "fas-eye", "geometry": ["point", "area"], "terms": ["eye", "glasses", "lasik", "lenses", "vision"], "tags": {"healthcare": "optometrist"}, "name": "Optometrist"},
     "healthcare/physiotherapist": {"icon": "temaki-physiotherapist", "geometry": ["point", "area"], "terms": ["physical", "therapist", "therapy"], "tags": {"healthcare": "physiotherapist"}, "name": "Physiotherapist"},
-    "healthcare/podiatrist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["feet", "foot", "nails"], "tags": {"healthcare": "podiatrist"}, "name": "Podiatrist"},
+    "healthcare/podiatrist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["foot", "feet", "nails"], "tags": {"healthcare": "podiatrist"}, "name": "Podiatrist"},
     "healthcare/psychotherapist": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["anxiety", "counselor", "depression", "mental health", "mind", "suicide", "therapist", "therapy"], "tags": {"healthcare": "psychotherapist"}, "name": "Psychotherapist"},
     "healthcare/rehabilitation": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["rehab", "therapist", "therapy"], "tags": {"healthcare": "rehabilitation"}, "name": "Rehabilitation Facility"},
     "healthcare/speech_therapist": {"icon": "fas-comment", "geometry": ["point", "area"], "terms": ["speech", "therapist", "therapy", "voice"], "tags": {"healthcare": "speech_therapist"}, "name": "Speech Therapist"},
@@ -476,50 +476,50 @@
     "highway/bus_guideway": {"icon": "maki-bus", "fields": ["name", "operator", "oneway", "structure", "covered"], "moreFields": ["trolley_wire"], "geometry": ["line"], "tags": {"highway": "bus_guideway"}, "addTags": {"highway": "bus_guideway", "access": "no", "bus": "designated"}, "terms": [], "name": "Bus Guideway"},
     "highway/construction": {"icon": "maki-barrier", "fields": ["name", "opening_date", "check_date", "note", "oneway", "structure", "access"], "geometry": ["line"], "tags": {"highway": "construction", "access": "no"}, "terms": ["closed", "closure", "construction"], "name": "Road Closed"},
     "highway/corridor": {"icon": "temaki-pedestrian", "fields": ["name", "width", "level", "access_simple", "wheelchair"], "moreFields": ["covered", "indoor", "maxheight", "stroller"], "geometry": ["line"], "tags": {"highway": "corridor"}, "addTags": {"highway": "corridor", "indoor": "yes"}, "terms": ["gallery", "hall", "hallway", "indoor", "passage", "passageway"], "name": "Indoor Corridor"},
-    "highway/crossing/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["crosswalk", "flat top", "hump", "marked crossing", "slow", "speed", "zebra crossing"], "name": "Marked Crosswalk (Raised)", "searchable": false},
-    "highway/crossing/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["crosswalk", "marked crossing", "zebra crossing"], "name": "Marked Crosswalk", "searchable": false},
-    "highway/crossing/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["crosswalk", "flat top", "hump", "marked crossing", "slow", "speed", "zebra crossing"], "name": "Marked Crosswalk (Raised)"},
-    "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "addTags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["crosswalk", "marked crossing", "zebra crossing"], "name": "Marked Crosswalk"},
-    "highway/crossing/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "slow", "speed"], "name": "Unmarked Crossing (Raised)"},
+    "highway/crossing/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false},
+    "highway/crossing/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "zebra"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false},
+    "highway/crossing/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"},
+    "highway/crossing/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "marked"}, "addTags": {"highway": "crossing", "crossing": "marked"}, "reference": {"key": "highway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk"},
+    "highway/crossing/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"},
     "highway/crossing/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "tactile_paving", "crossing/island"], "geometry": ["vertex"], "tags": {"highway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "crossing", "crossing": "unmarked"}, "reference": {"key": "crossing", "value": "unmarked"}, "terms": [], "name": "Unmarked Crossing"},
     "highway/cycleway": {"icon": "fas-biking", "fields": ["name", "oneway", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxspeed", "maxweight_bridge", "not/name", "smoothness", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "cycleway"}, "terms": ["bicyle path", "bike path", "cycling path"], "matchScore": 0.9, "name": "Cycle Path"},
     "highway/cycleway/crossing": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing"}, "addTags": {"highway": "cycleway", "cycleway": "crossing"}, "reference": {"key": "cycleway", "value": "crossing"}, "searchable": false, "matchScore": 0.95, "name": "Cycle Crossing"},
-    "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr"], "icon": "fas-biking", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "rail trail", "segregated trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"},
-    "highway/cycleway/crossing/marked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["bicycle crossing", "bike crossing", "cycle crosswalk", "cycle path crossing", "cycleway crossing"], "name": "Marked Cycle Crossing"},
-    "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["bicycle crossing", "bike crossing", "cycle path crossing", "cycleway crossing"], "name": "Unmarked Cycle Crossing"},
+    "highway/cycleway/bicycle_foot": {"notCountryCodes": ["fr"], "icon": "fas-biking", "geometry": ["line"], "tags": {"highway": "cycleway", "foot": "designated"}, "addTags": {"highway": "cycleway", "foot": "designated", "bicycle": "designated"}, "terms": ["bicycle and foot path", "bike and pedestrian path", "green way", "greenway", "mixed-use trail", "multi-use trail", "segregated trail", "rail trail"], "matchScore": 0.95, "name": "Cycle & Foot Path"},
+    "highway/cycleway/crossing/marked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "marked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "marked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle crosswalk", "cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Marked Cycle Crossing"},
+    "highway/cycleway/crossing/unmarked": {"icon": "fas-biking", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"cycleway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "cycleway", "cycleway": "crossing", "crossing": "unmarked"}, "reference": {"key": "cycleway", "value": "crossing"}, "terms": ["cycle path crossing", "cycleway crossing", "bicycle crossing", "bike crossing"], "name": "Unmarked Cycle Crossing"},
     "highway/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi", "access_simple", "wheelchair", "maxweight"], "moreFields": ["maxheight", "opening_hours"], "geometry": ["vertex"], "tags": {"highway": "elevator"}, "terms": ["lift"], "name": "Elevator"},
     "highway/emergency_bay": {"icon": "maki-car", "geometry": ["vertex"], "tags": {"highway": "emergency_bay"}, "terms": ["Highway Emergency Bay"], "name": "Emergency Stopping Place"},
     "highway/footway": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "lit", "maxweight_bridge", "not/name", "smoothness", "stroller", "tactile_paving", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "promenade", "trackway", "trail", "walk"], "tags": {"highway": "footway"}, "matchScore": 0.9, "name": "Foot Path"},
     "highway/footway/crossing": {"fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing"}, "addTags": {"highway": "footway", "footway": "crossing"}, "reference": {"key": "footway", "value": "crossing"}, "matchScore": 0.95, "searchable": false, "name": "Pedestrian Crossing"},
-    "highway/footway/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["crosswalk", "flat top", "hump", "marked crossing", "slow", "speed", "zebra crossing"], "name": "Marked Crosswalk (Raised)", "searchable": false},
-    "highway/footway/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["crosswalk", "marked crossing", "zebra crossing"], "name": "Marked Crosswalk", "searchable": false},
-    "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["autwalk", "conveyor", "moving sidewalk", "skywalk", "travelator", "travellator", "travolator"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
-    "highway/footway/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["crosswalk", "flat top", "hump", "marked crossing", "slow", "speed", "zebra crossing"], "name": "Marked Crosswalk (Raised)"},
-    "highway/footway/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["marked crossing", "marked foot path crossing", "marked pedestrian crosswalk", "zebra crossing"], "name": "Marked Crosswalk"},
+    "highway/footway/zebra-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)", "searchable": false},
+    "highway/footway/zebra": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"highway": "footway", "footway": "crossing", "crossing": "zebra"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["zebra crossing", "marked crossing", "crosswalk"], "name": "Marked Crosswalk", "searchable": false},
+    "highway/footway/conveying": {"icon": "temaki-pedestrian", "fields": ["name", "conveying", "access_simple", "lit", "width", "wheelchair"], "geometry": ["line"], "terms": ["moving sidewalk", "autwalk", "skywalk", "travolator", "travelator", "travellator", "conveyor"], "tags": {"highway": "footway", "conveying": "*"}, "name": "Moving Walkway"},
+    "highway/footway/marked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["zebra crossing", "marked crossing", "crosswalk", "flat top", "hump", "speed", "slow"], "name": "Marked Crosswalk (Raised)"},
+    "highway/footway/marked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "marked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "marked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["marked foot path crossing", "marked crossing", "marked pedestrian crosswalk", "zebra crossing"], "name": "Marked Crosswalk"},
     "highway/footway/sidewalk": {"icon": "temaki-pedestrian", "geometry": ["line"], "tags": {"footway": "sidewalk"}, "addTags": {"highway": "footway", "footway": "sidewalk"}, "reference": {"key": "footway", "value": "sidewalk"}, "terms": ["pavement", "sidepath"], "name": "Sidewalk"},
-    "highway/footway/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "slow", "speed"], "name": "Unmarked Crossing (Raised)"},
-    "highway/footway/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["unmarked crosswalk", "unmarked foot path crossing", "unmarked pedestrian crossing"], "name": "Unmarked Crossing"},
-    "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "sign", "yield"], "name": "Yield Sign"},
+    "highway/footway/unmarked-raised": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked", "traffic_calming": "table"}, "reference": {"key": "traffic_calming", "value": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Unmarked Crossing (Raised)"},
+    "highway/footway/unmarked": {"icon": "temaki-pedestrian", "fields": ["crossing", "access", "surface", "tactile_paving", "crossing/island"], "geometry": ["line"], "tags": {"footway": "crossing", "crossing": "unmarked"}, "addTags": {"highway": "footway", "footway": "crossing", "crossing": "unmarked"}, "reference": {"key": "footway", "value": "crossing"}, "terms": ["unmarked foot path crossing", "unmarked crosswalk", "unmarked pedestrian crossing"], "name": "Unmarked Crossing"},
+    "highway/give_way": {"icon": "temaki-yield", "fields": ["direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "give_way"}, "terms": ["give way", "yield", "sign"], "name": "Yield Sign"},
     "highway/living_street": {"icon": "iD-highway-living-street", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "flood_prone", "junction_line", "lit", "maxheight", "maxweight_bridge", "oneway/bicycle", "smoothness", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "living_street"}, "name": "Living Street"},
     "highway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["distance", "direction_vertex"], "tags": {"highway": "milestone"}, "terms": ["mile marker", "mile post", "mile stone", "mileage marker", "milemarker", "milepost"], "name": "Highway Milestone"},
     "highway/mini_roundabout": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "terms": ["traffic circle"], "tags": {"highway": "mini_roundabout"}, "fields": ["direction_clock"], "name": "Mini-Roundabout"},
     "highway/motorway_junction": {"icon": "temaki-junction", "fields": ["ref_highway_junction", "name"], "geometry": ["vertex"], "tags": {"highway": "motorway_junction"}, "terms": ["exit"], "name": "Motorway Junction / Exit"},
-    "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["destination_oneway", "destination/ref_oneway", "junction/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "destination/symbol_oneway", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "ref_road_number", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "off ramp", "on ramp", "ramp", "road", "street"], "name": "Motorway Link"},
+    "highway/motorway_link": {"icon": "iD-highway-motorway-link", "fields": ["destination_oneway", "destination/ref_oneway", "junction/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "destination/symbol_oneway", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "ref_road_number", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "motorway_link"}, "addTags": {"highway": "motorway_link", "oneway": "yes"}, "terms": ["exit", "ramp", "road", "street", "on ramp", "off ramp"], "name": "Motorway Link"},
     "highway/motorway": {"icon": "iD-highway-motorway", "fields": ["name", "ref_road_number", "oneway_yes", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "maxweight_bridge", "minspeed", "not/name", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "motorway"}, "terms": ["autobahn", "expressway", "freeway", "highway", "interstate", "parkway", "road", "street", "thruway", "turnpike"], "name": "Motorway"},
     "highway/passing_place": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "passing_place"}, "terms": ["turnout, pullout"], "name": "Passing Place"},
-    "highway/path": {"icon": "iD-other-line", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "not/name", "ref", "sac_scale", "smoothness", "stroller", "trail_visibility", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
-    "highway/path/informal": {"icon": "iD-other-line", "fields": ["surface", "width", "access", "trail_visibility", "smoothness", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "sac_scale", "stroller", "structure", "wheelchair"], "geometry": ["line"], "terms": ["bootleg trail", "cow path", "desire line", "desire path", "desireline", "desirepath", "elephant path", "game trail", "goat track", "herd path", "pig trail", "shortcut", "social trail", "use trail"], "tags": {"highway": "path", "informal": "yes"}, "reference": {"key": "informal"}, "name": "Informal Path"},
+    "highway/path": {"icon": "iD-other-line", "fields": ["name", "surface", "width", "structure", "access", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "not/name", "ref", "sac_scale", "smoothness", "stroller", "trail_visibility", "wheelchair"], "geometry": ["line"], "terms": ["hike", "hiking", "trackway", "trail", "walk"], "tags": {"highway": "path"}, "name": "Path"},
+    "highway/path/informal": {"icon": "iD-other-line", "fields": ["surface", "width", "access", "trail_visibility", "smoothness", "incline"], "moreFields": ["covered", "dog", "horse_scale", "informal", "lit", "maxweight_bridge", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "sac_scale", "stroller", "structure", "wheelchair"], "geometry": ["line"], "terms": ["bootleg trail", "cow path", "desire line", "desire path", "desireline", "desirepath", "elephant path", "game trail", "goat track", "herd path", "pig trail", "shortcut", "social trail", "use trail"], "tags": {"highway": "path", "informal": "yes"}, "reference": {"key": "informal"}, "name": "Informal Path"},
     "highway/pedestrian_area": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "structure", "access"], "geometry": ["area"], "tags": {"highway": "pedestrian", "area": "yes"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Area"},
     "highway/pedestrian_line": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "lit", "width", "oneway", "structure", "access"], "moreFields": ["covered", "incline", "maxweight_bridge", "smoothness"], "geometry": ["line"], "tags": {"highway": "pedestrian"}, "terms": ["center", "centre", "plaza", "quad", "square", "walkway"], "name": "Pedestrian Street"},
-    "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "cycleway", "destination/symbol_oneway", "flood_prone", "incline", "junction_line", "junction/ref_oneway", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["off ramp", "on ramp", "ramp", "road", "street"], "name": "Primary Link"},
+    "highway/primary_link": {"icon": "iD-highway-primary-link", "fields": ["destination_oneway", "destination/ref_oneway", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "cycleway", "destination/symbol_oneway", "flood_prone", "incline", "junction/ref_oneway", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "name", "oneway/bicycle", "ref_road_number", "smoothness", "toll", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "primary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Primary Link"},
     "highway/primary": {"icon": "iD-highway-primary", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "ref_road_number", "access"], "moreFields": ["charge_toll", "covered", "cycleway", "flood_prone", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "not/name", "oneway/bicycle", "smoothness", "toll", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "primary"}, "terms": ["road", "street"], "name": "Primary Road"},
     "highway/raceway": {"icon": "fas-flag-checkered", "fields": ["name", "oneway", "surface", "sport_racing_motor", "lit", "width", "lanes", "structure"], "geometry": ["line", "area"], "tags": {"highway": "raceway"}, "addTags": {"highway": "raceway", "sport": "motor"}, "terms": ["auto*", "formula one", "kart", "motocross", "nascar", "race*", "track"], "name": "Motorsport Racetrack"},
     "highway/raceway/karting": {"icon": "fas-flag-checkered", "geometry": ["line", "area"], "tags": {"highway": "raceway", "sport": "karting"}, "terms": ["carting", "go carts", "go karts", "go-karts", "gokarts", "kart racing", "karting track", "motorsports", "shifter karts", "superkarts"], "name": "Karting Racetrack"},
-    "highway/raceway/motocross": {"icon": "fas-motorcycle", "geometry": ["line", "area"], "tags": {"highway": "raceway", "sport": "motocross"}, "terms": ["motocross circuit", "motorcycle track", "motorsports", "off-road racing", "offroad moto racing"], "name": "Motocross Racetrack"},
-    "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "flood_prone", "incline", "junction_line", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "not/name", "oneway/bicycle", "smoothness", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"},
-    "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"},
+    "highway/raceway/motocross": {"icon": "fas-motorcycle", "geometry": ["line", "area"], "tags": {"highway": "raceway", "sport": "motocross"}, "terms": ["off-road racing", "offroad moto racing", "motocross circuit", "motorcycle track", "motorsports"], "name": "Motocross Racetrack"},
+    "highway/residential": {"icon": "iD-highway-residential", "fields": ["name", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["covered", "cycleway", "flood_prone", "incline", "junction_line", "lit", "oneway/bicycle", "maxheight", "maxspeed/advisory", "maxweight_bridge", "not/name", "smoothness", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "residential"}, "terms": ["road", "street"], "name": "Residential Road"},
+    "highway/rest_area": {"icon": "maki-car", "fields": ["name", "operator", "opening_hours"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "rest_area"}, "terms": ["rest stop"], "name": "Rest Area"},
     "highway/road": {"icon": "iD-other-line", "fields": ["highway", "{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "road"}, "terms": ["road", "street"], "name": "Unknown Road"},
-    "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["off ramp", "on ramp", "ramp", "road", "street"], "name": "Secondary Link"},
+    "highway/secondary_link": {"icon": "iD-highway-secondary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "secondary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Secondary Link"},
     "highway/secondary": {"icon": "iD-highway-secondary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "secondary"}, "terms": ["road", "street"], "name": "Secondary Road"},
     "highway/service": {"icon": "iD-highway-service", "fields": ["name", "service", "oneway", "maxspeed", "surface", "covered", "structure", "access"], "moreFields": ["flood_prone", "incline", "lanes", "lit", "maxheight", "maxspeed/advisory", "maxweight_bridge", "oneway/bicycle", "trolley_wire"], "geometry": ["line"], "tags": {"highway": "service"}, "terms": ["road", "street"], "matchScore": 0.9, "name": "Service Road"},
     "highway/service/alley": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "alley"}, "reference": {"key": "service", "value": "alley"}, "name": "Alley"},
@@ -527,20 +527,20 @@
     "highway/service/driveway": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "driveway"}, "reference": {"key": "service", "value": "driveway"}, "name": "Driveway"},
     "highway/service/emergency_access": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "emergency_access"}, "reference": {"key": "service", "value": "emergency_access"}, "name": "Emergency Access"},
     "highway/service/parking_aisle": {"icon": "iD-highway-service", "geometry": ["line"], "tags": {"highway": "service", "service": "parking_aisle"}, "reference": {"key": "service", "value": "parking_aisle"}, "name": "Parking Aisle"},
-    "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["service station", "services", "travel plaza"], "name": "Service Area"},
+    "highway/services": {"icon": "maki-car", "fields": ["{highway/rest_area}"], "moreFields": ["{highway/rest_area}"], "geometry": ["point", "vertex", "area"], "tags": {"highway": "services"}, "terms": ["services", "travel plaza", "service station"], "name": "Service Area"},
     "highway/speed_camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["direction", "ref", "maxspeed"], "tags": {"highway": "speed_camera"}, "terms": [], "name": "Speed Camera"},
-    "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["staircase", "stairs", "stairway"], "name": "Steps"},
+    "highway/steps": {"icon": "iD-highway-steps", "fields": ["incline_steps", "access_simple", "handrail", "step_count", "surface", "width"], "moreFields": ["covered", "dog", "indoor", "level_semi", "lit", "name", "ref", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "steps"}, "terms": ["stairs", "staircase", "stairway"], "name": "Steps"},
     "highway/steps/conveying": {"icon": "maki-entrance", "fields": ["incline_steps", "conveying", "access_simple", "indoor", "level_semi", "width"], "moreFields": ["{highway/steps}", "handrail", "step_count", "surface"], "geometry": ["line"], "terms": ["moving staircase", "moving stairway", "people mover"], "tags": {"highway": "steps", "conveying": "*"}, "name": "Escalator"},
-    "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["halt", "sign", "stop"], "name": "Stop Sign"},
-    "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["gaslight", "lamp", "light", "street light", "streetlight"], "name": "Street Lamp"},
-    "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["off ramp", "on ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
+    "highway/stop": {"icon": "temaki-stop", "fields": ["stop", "direction_vertex"], "geometry": ["vertex"], "tags": {"highway": "stop"}, "terms": ["stop", "halt", "sign"], "name": "Stop Sign"},
+    "highway/street_lamp": {"icon": "temaki-bulb", "geometry": ["point", "vertex"], "tags": {"highway": "street_lamp"}, "fields": ["lamp_type", "direction", "ref"], "terms": ["streetlight", "street light", "lamp", "light", "gaslight"], "name": "Street Lamp"},
+    "highway/tertiary_link": {"icon": "iD-highway-tertiary-link", "fields": ["{highway/primary_link}"], "moreFields": ["{highway/primary_link}"], "geometry": ["line"], "tags": {"highway": "tertiary_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Tertiary Link"},
     "highway/tertiary": {"icon": "iD-highway-tertiary", "fields": ["{highway/primary}"], "moreFields": ["{highway/primary}"], "geometry": ["line"], "tags": {"highway": "tertiary"}, "terms": ["road", "street"], "name": "Tertiary Road"},
-    "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/imba", "mtb/scale/uphill", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["4wd", "4x4", "agricultural road", "atv", "carriage road", "double track", "farm road", "fire road", "forest road", "four wheel drive", "jeep", "logging road", "offroad", "primitive", "quad", "ranch road", "rut", "two track", "unmaintained", "woods road"], "name": "Unmaintained Track Road"},
+    "highway/track": {"icon": "fas-truck-monster", "fields": ["name", "tracktype", "surface", "width", "structure", "access", "incline", "smoothness"], "moreFields": ["covered", "flood_prone", "horse_scale", "maxweight_bridge", "mtb/scale", "mtb/scale/uphill", "mtb/scale/imba", "stroller", "wheelchair"], "geometry": ["line"], "tags": {"highway": "track"}, "terms": ["woods road", "forest road", "logging road", "fire road", "farm road", "agricultural road", "ranch road", "carriage road", "primitive", "unmaintained", "rut", "offroad", "4wd", "4x4", "four wheel drive", "atv", "quad", "jeep", "double track", "two track"], "name": "Unmaintained Track Road"},
     "highway/traffic_mirror": {"icon": "maki-circle-stroked", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"highway": "traffic_mirror"}, "terms": ["blind spot", "convex", "corner", "curved", "roadside", "round", "safety", "sphere", "visibility"], "name": "Traffic Mirror"},
     "highway/traffic_signals": {"icon": "temaki-traffic_signals", "geometry": ["vertex"], "tags": {"highway": "traffic_signals"}, "fields": ["traffic_signals", "traffic_signals/direction"], "terms": ["light", "stoplight", "traffic light"], "name": "Traffic Signals"},
-    "highway/trailhead": {"icon": "fas-hiking", "fields": ["name", "operator", "elevation", "address", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["opening_hours"], "geometry": ["vertex"], "tags": {"highway": "trailhead"}, "terms": ["hiking", "mile zero", "mountain biking", "mountaineering", "staging area", "trail endpoint", "trail start", "trekking"], "name": "Trailhead"},
-    "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["off ramp", "on ramp", "ramp", "road", "street"], "name": "Trunk Link"},
-    "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "maxweight_bridge", "minspeed", "not/name", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"},
+    "highway/trailhead": {"icon": "fas-hiking", "fields": ["name", "operator", "elevation", "address", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["opening_hours"], "geometry": ["vertex"], "tags": {"highway": "trailhead"}, "terms": ["hiking", "mile zero", "mountain biking", "mountaineering", "trail endpoint", "trail start", "staging area", "trekking"], "name": "Trailhead"},
+    "highway/trunk_link": {"icon": "iD-highway-trunk-link", "fields": ["{highway/motorway_link}"], "moreFields": ["{highway/motorway_link}"], "geometry": ["line"], "tags": {"highway": "trunk_link"}, "terms": ["on ramp", "off ramp", "ramp", "road", "street"], "name": "Trunk Link"},
+    "highway/trunk": {"icon": "iD-highway-trunk", "fields": ["name", "ref_road_number", "oneway", "maxspeed", "lanes", "surface", "structure", "access"], "moreFields": ["charge_toll", "covered", "incline", "junction_line", "lit", "maxheight", "minspeed", "maxweight_bridge", "not/name", "smoothness", "toll"], "geometry": ["line"], "tags": {"highway": "trunk"}, "terms": ["road", "street"], "name": "Trunk Road"},
     "highway/turning_circle": {"icon": "maki-circle-stroked", "geometry": ["vertex"], "tags": {"highway": "turning_circle"}, "terms": ["cul-de-sac"], "name": "Turning Circle"},
     "highway/turning_loop": {"icon": "maki-circle", "geometry": ["vertex"], "tags": {"highway": "turning_loop"}, "terms": ["cul-de-sac"], "name": "Turning Loop (Island)"},
     "highway/unclassified": {"icon": "iD-highway-unclassified", "fields": ["{highway/residential}"], "moreFields": ["{highway/residential}"], "geometry": ["line"], "tags": {"highway": "unclassified"}, "terms": ["road", "street"], "name": "Minor/Unclassified Road"},
@@ -549,28 +549,28 @@
     "historic/boundary_stone": {"icon": "temaki-milestone", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex"], "tags": {"historic": "boundary_stone"}, "name": "Boundary Stone"},
     "historic/castle": {"icon": "maki-castle", "fields": ["name", "castle_type", "building_area", "historic/civilization", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "castle"}, "name": "Castle"},
     "historic/castle/fortress": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "fortress"}, "tags": {"historic": "castle", "castle_type": "fortress"}, "terms": ["citadel", "military"], "name": "Historic Fortress"},
-    "historic/castle/palace": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "palace"}, "tags": {"historic": "castle", "castle_type": "palace"}, "terms": ["king", "queen", "royal", "Royal Residence"], "name": "Palace"},
-    "historic/castle/stately": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "stately"}, "tags": {"historic": "castle", "castle_type": "stately"}, "terms": ["gentry", "Historic Country House", "nobility", "representative", "Stately Home"], "name": "Château"},
+    "historic/castle/palace": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "palace"}, "tags": {"historic": "castle", "castle_type": "palace"}, "terms": ["Royal Residence", "royal", "king", "queen"], "name": "Palace"},
+    "historic/castle/stately": {"icon": "fas-crown", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "reference": {"key": "castle_type", "value": "stately"}, "tags": {"historic": "castle", "castle_type": "stately"}, "terms": ["Historic Country House", "Stately Home", "nobility", "gentry", "representative"], "name": "Château"},
     "historic/city_gate": {"icon": "maki-castle", "fields": ["name", "building_area", "historic/civilization", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "city_gate"}, "terms": ["Town Gate"], "name": "City Gate"},
     "historic/fort": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "fort"}, "terms": ["military"], "name": "Historic Fort"},
-    "historic/manor": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "manor"}, "terms": ["estate", "gentry", "Mansion", "nobility"], "name": "Manor House"},
-    "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "memory", "monument", "remember", "remembrance", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"},
-    "historic/memorial/plaque": {"icon": "maki-monument", "fields": ["{historic/memorial}", "direction"], "geometry": ["point", "vertex"], "terms": ["dedicatory", "epitaph", "historical marker", "memory", "remember", "remembrance"], "tags": {"historic": "memorial", "memorial": "plaque"}, "reference": {"key": "memorial", "value": "plaque"}, "name": "Commemorative Plaque"},
+    "historic/manor": {"icon": "maki-castle", "fields": ["name", "building_area", "access_simple", "start_date"], "geometry": ["point", "area"], "tags": {"historic": "manor"}, "terms": ["Mansion", "gentry", "nobility", "estate"], "name": "Manor House"},
+    "historic/memorial": {"icon": "maki-monument", "fields": ["name", "memorial", "inscription", "material"], "moreFields": ["website"], "geometry": ["point", "vertex", "area"], "terms": ["dedicatory", "epitaph", "remember", "remembrance", "memory", "monument", "stolperstein"], "tags": {"historic": "memorial"}, "name": "Memorial"},
+    "historic/memorial/plaque": {"icon": "maki-monument", "fields": ["{historic/memorial}", "direction"], "geometry": ["point", "vertex"], "terms": ["dedicatory", "epitaph", "historical marker", "remember", "remembrance", "memory"], "tags": {"historic": "memorial", "memorial": "plaque"}, "reference": {"key": "memorial", "value": "plaque"}, "name": "Commemorative Plaque"},
     "historic/monument": {"icon": "maki-monument", "fields": ["name", "inscription", "access_simple"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "monument"}, "name": "Monument"},
     "historic/ruins": {"icon": "temaki-ruins", "fields": ["name", "historic/civilization", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "ruins"}, "name": "Ruins"},
     "historic/tomb": {"icon": "maki-cemetery", "fields": ["name", "tomb", "building_area", "inscription", "access_simple"], "geometry": ["point", "area"], "tags": {"historic": "tomb"}, "name": "Tomb"},
     "historic/wayside_cross": {"icon": "maki-religious-christian", "fields": ["name", "inscription"], "moreFields": ["material"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_cross"}, "name": "Wayside Cross"},
     "historic/wayside_shrine": {"icon": "maki-landmark", "fields": ["name", "religion", "denomination", "inscription", "access_simple"], "geometry": ["point", "vertex", "area"], "tags": {"historic": "wayside_shrine"}, "name": "Wayside Shrine"},
-    "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["boat", "hull", "maritime", "mast", "remains", "ship"], "name": "Shipwreck"},
+    "historic/wreck": {"icon": "temaki-ruins", "fields": ["name", "access_simple", "seamark/wreck/category", "historic/wreck/date_sunk", "historic/wreck/visible_at_low_tide", "historic/wreck/visible_at_high_tide"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"historic": "wreck"}, "addTags": {"historic": "wreck", "seamark:type": "wreck"}, "terms": ["hull", "mast", "maritime", "remains", "ship", "boat"], "name": "Shipwreck"},
     "indoor/corridor_line": {"fields": ["level", "name"], "geometry": ["line"], "tags": {"indoor": "corridor"}, "searchable": false, "matchScore": 1.1, "name": "Indoor Corridor", "replacement": "highway/corridor"},
     "indoor/area": {"fields": ["level", "name", "ref_room_number", "height"], "geometry": ["area"], "tags": {"indoor": "area"}, "terms": ["indoor space"], "matchScore": 0.8, "name": "Indoor Area"},
     "indoor/corridor": {"icon": "temaki-pedestrian", "fields": ["level", "name", "ref", "height"], "geometry": ["area"], "tags": {"indoor": "corridor"}, "terms": ["concourse", "foyer", "hallway", "passageway"], "matchScore": 0.8, "name": "Indoor Corridor"},
     "indoor/door": {"icon": "maki-entrance-alt1", "fields": ["level", "ref", "door_type", "access_simple", "width", "height"], "moreFields": ["wheelchair"], "geometry": ["vertex"], "tags": {"indoor": "door"}, "addTags": {"indoor": "door", "door": "yes"}, "removeTags": {"indoor": "door", "door": "*"}, "terms": ["doorframe", "doorway", "portal", "room access", "threshold"], "name": "Indoor Door"},
     "indoor/elevator": {"icon": "temaki-elevator", "fields": ["ref", "level_semi"], "geometry": ["area"], "tags": {"indoor": "room", "elevator": "yes"}, "terms": ["elevator", "lift"], "matchScore": 0.8, "name": "Indoor Elevator Shaft"},
     "indoor/room": {"fields": ["level", "name", "ref_room_number", "room", "height"], "geometry": ["area"], "tags": {"indoor": "room"}, "terms": ["antechamber", "anteroom", "atrium", "cell", "chamber", "concourse", "foyer", "indoor room", "lobby", "vestibule"], "matchScore": 0.8, "name": "Room"},
-    "indoor/stairs": {"icon": "iD-highway-steps", "fields": ["ref", "level_semi", "conveying_escalator"], "geometry": ["area"], "tags": {"indoor": "room", "stairs": "yes"}, "terms": ["stair", "staircase", "stairs", "stairway", "stairwell", "steps"], "matchScore": 0.8, "name": "Indoor Stairwell"},
+    "indoor/stairs": {"icon": "iD-highway-steps", "fields": ["ref", "level_semi", "conveying_escalator"], "geometry": ["area"], "tags": {"indoor": "room", "stairs": "yes"}, "terms": ["stair", "stairs", "staircase", "stairway", "stairwell", "steps"], "matchScore": 0.8, "name": "Indoor Stairwell"},
     "indoor/wall": {"icon": "temaki-wall", "fields": ["level", "height"], "geometry": ["line"], "tags": {"indoor": "wall"}, "terms": ["indoor barrier", "room divider", "room partition"], "name": "Indoor Wall"},
-    "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["hotspot", "wi-fi", "wifi"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
+    "internet_access/wlan": {"icon": "fas-wifi", "geometry": ["point", "area"], "fields": ["internet_access/ssid", "internet_access/fee"], "moreFields": ["level"], "terms": ["wi-fi", "wifi", "hotspot"], "tags": {"internet_access": "wlan"}, "matchScore": 0.25, "name": "Wi-Fi Hotspot"},
     "junction": {"icon": "temaki-junction", "fields": ["name"], "geometry": ["vertex", "area"], "tags": {"junction": "yes"}, "name": "Junction"},
     "junction/circular": {"geometry": ["vertex", "line"], "fields": ["name"], "tags": {"junction": "circular"}, "name": "Traffic Circle", "searchable": false},
     "junction/jughandle": {"geometry": ["line"], "fields": ["name"], "tags": {"junction": "jughandle"}, "name": "Jughandle", "searchable": false},
@@ -579,90 +579,90 @@
     "landuse/farm": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "geometry": ["point", "area"], "tags": {"landuse": "farm"}, "name": "Farmland", "searchable": false},
     "landuse/pond": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "pond"}, "name": "Pond", "searchable": false},
     "landuse/reservoir": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["area"], "tags": {"landuse": "reservoir"}, "name": "Reservoir", "searchable": false},
-    "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
-    "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["algaculture", "algae", "aquafarming", "crustacean", "fish farm", "mariculture", "oyster farm", "shrimp farm"], "name": "Aquaculture"},
+    "landuse/allotments": {"icon": "maki-garden-centre", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "allotments"}, "terms": ["allotment", "garden"], "name": "Community Garden"},
+    "landuse/aquaculture": {"icon": "maki-aquarium", "fields": ["name", "operator", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "aquaculture"}, "terms": ["fish farm", "crustacean", "algae", "aquafarming", "shrimp farm", "oyster farm", "mariculture", "algaculture"], "name": "Aquaculture"},
     "landuse/brownfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "brownfield"}, "terms": [], "matchScore": 0.9, "name": "Brownfield"},
-    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
-    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
-    "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
-    "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
-    "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
-    "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
+    "landuse/cemetery": {"icon": "maki-cemetery", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "cemetery"}, "terms": [], "name": "Cemetery"},
+    "landuse/churchyard": {"icon": "maki-religious-christian", "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "churchyard"}, "terms": [], "name": "Churchyard"},
+    "landuse/commercial": {"icon": "maki-suitcase", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "commercial"}, "terms": [], "matchScore": 0.9, "name": "Commercial Area"},
+    "landuse/construction": {"icon": "temaki-tools", "fields": ["name", "construction", "operator", "opening_date", "check_date", "note"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "construction"}, "terms": [], "name": "Construction"},
+    "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
+    "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
     "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"},
-    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"},
-    "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
+    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree"], "name": "Managed Forest"},
+    "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
     "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"},
     "landuse/greenfield": {"geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"},
-    "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["flower", "greenhouse", "grow", "horticulture", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
-    "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
-    "landuse/industrial": {"icon": "maki-industry", "fields": ["name", "industrial"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "industrial"}, "terms": [], "matchScore": 0.9, "name": "Industrial Area"},
+    "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
+    "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
+    "landuse/industrial": {"icon": "maki-industry", "fields": ["name", "industrial"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "industrial"}, "terms": [], "matchScore": 0.9, "name": "Industrial Area"},
     "landuse/industrial/scrap_yard": {"icon": "maki-car", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"industrial": "scrap_yard"}, "addTags": {"landuse": "industrial", "industrial": "scrap_yard"}, "reference": {"key": "industrial", "value": "scrap_yard"}, "terms": ["car", "junk", "metal", "salvage", "scrap", "u-pull-it", "vehicle", "wreck", "yard"], "name": "Scrap Yard"},
     "landuse/industrial/slaughterhouse": {"icon": "maki-slaughterhouse", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "geometry": ["point", "area"], "tags": {"industrial": "slaughterhouse"}, "addTags": {"landuse": "industrial", "industrial": "slaughterhouse"}, "reference": {"key": "industrial", "value": "slaughterhouse"}, "terms": ["abattoir", "beef", "butchery", "calf", "chicken", "cow", "killing house", "meat", "pig", "pork", "poultry", "shambles", "stockyard"], "name": "Slaughterhouse"},
-    "landuse/landfill": {"geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
+    "landuse/landfill": {"geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "landfill"}, "terms": ["dump"], "name": "Landfill"},
     "landuse/meadow": {"icon": "maki-garden", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "meadow"}, "terms": ["grazing", "hay field", "pasture"], "name": "Meadow"},
-    "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
+    "landuse/military": {"icon": "temaki-military", "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "military"}, "terms": [], "matchScore": 0.9, "name": "Military Area"},
     "landuse/military/airfield": {"icon": "tnp-2009265", "fields": ["name", "iata", "icao"], "geometry": ["point", "area"], "tags": {"military": "airfield"}, "addTags": {"aeroway": "aerodrome", "landuse": "military", "military": "airfield"}, "reference": {"key": "military", "value": "airfield"}, "terms": ["aerodrome", "aeroway", "air force", "airplane", "airport", "army", "base", "bomb", "fight", "force", "guard", "heli*", "jet", "marine", "navy", "plane", "troop", "war"], "name": "Military Airfield"},
     "landuse/military/barracks": {"icon": "temaki-military", "fields": ["name", "building_area"], "geometry": ["point", "area"], "tags": {"military": "barracks"}, "addTags": {"landuse": "military", "military": "barracks"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Barracks"},
-    "landuse/military/danger_area": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "danger_area"}, "addTags": {"landuse": "military", "military": "danger_area"}, "terms": ["air force", "army", "base", "blast", "bomb", "explo*", "force", "guard", "marine", "mine", "navy", "troop", "war"], "name": "Danger Area"},
+    "landuse/military/danger_area": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "danger_area"}, "addTags": {"landuse": "military", "military": "danger_area"}, "terms": ["air force", "army", "base", "blast", "bomb", "explo*", "force", "guard", "mine", "marine", "navy", "troop", "war"], "name": "Danger Area"},
     "landuse/military/naval_base": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "naval_base"}, "addTags": {"landuse": "military", "military": "naval_base"}, "terms": ["base", "fight", "force", "guard", "marine", "navy", "ship", "sub", "troop", "war"], "name": "Naval Base"},
     "landuse/military/obstacle_course": {"icon": "temaki-military", "geometry": ["point", "area"], "tags": {"military": "obstacle_course"}, "addTags": {"landuse": "military", "military": "obstacle_course"}, "terms": ["army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Obstacle Course"},
     "landuse/military/range": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "range"}, "addTags": {"landuse": "military", "military": "range"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Military Range"},
     "landuse/military/training_area": {"icon": "temaki-military", "fields": ["name"], "geometry": ["point", "area"], "tags": {"military": "training_area"}, "addTags": {"landuse": "military", "military": "training_area"}, "terms": ["air force", "army", "base", "fight", "fire", "force", "guard", "gun", "marine", "navy", "rifle", "shoot*", "snip*", "train", "troop", "war"], "name": "Training Area"},
     "landuse/orchard": {"icon": "maki-park", "fields": ["name", "operator", "trees"], "moreFields": ["address", "email", "fax", "phone", "species/wikidata", "website"], "geometry": ["area"], "tags": {"landuse": "orchard"}, "terms": ["fruit"], "name": "Orchard"},
-    "landuse/plant_nursery": {"icon": "maki-garden", "fields": ["name", "operator", "plant"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
-    "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
-    "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "track", "train"], "name": "Railway Corridor"},
-    "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
-    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
+    "landuse/plant_nursery": {"icon": "maki-garden", "fields": ["name", "operator", "plant"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "plant_nursery"}, "terms": ["flower", "garden", "grow", "vivero"], "name": "Plant Nursery"},
+    "landuse/quarry": {"geometry": ["area"], "fields": ["name", "operator", "resource"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "quarry"}, "terms": [], "name": "Quarry"},
+    "landuse/railway": {"icon": "maki-rail", "fields": ["operator"], "geometry": ["area"], "tags": {"landuse": "railway"}, "terms": ["rail", "train", "track"], "name": "Railway Corridor"},
+    "landuse/recreation_ground": {"icon": "maki-pitch", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "recreation_ground"}, "terms": ["playing fields"], "name": "Recreation Ground"},
+    "landuse/religious": {"icon": "maki-place-of-worship", "geometry": ["area"], "fields": ["name", "religion", "denomination"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "religious"}, "terms": [], "name": "Religious Area"},
     "landuse/residential": {"icon": "maki-building", "geometry": ["area"], "tags": {"landuse": "residential"}, "terms": [], "matchScore": 0.9, "name": "Residential Area"},
     "landuse/residential/apartments": {"icon": "maki-building", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"residential": "apartments"}, "addTags": {"landuse": "residential", "residential": "apartments"}, "reference": {"key": "residential", "value": "apartments"}, "terms": ["flat", "residence", "tenement"], "name": "Apartment Complex"},
-    "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
-    "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
-    "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["access_simple", "address", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"},
+    "landuse/retail": {"icon": "maki-commercial", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "website", "phone", "email", "fax"], "tags": {"landuse": "retail"}, "matchScore": 0.9, "name": "Retail Area"},
+    "landuse/vineyard": {"fields": ["name", "operator", "grape_variety"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["area"], "tags": {"landuse": "vineyard"}, "addTags": {"landuse": "vineyard", "crop": "grape"}, "removeTags": {"landuse": "vineyard", "crop": "grape", "grape_variety": "*"}, "terms": ["grape", "wine"], "name": "Vineyard"},
+    "landuse/winter_sports": {"icon": "fas-skiing", "geometry": ["area"], "fields": ["name", "operator"], "moreFields": ["address", "access_simple", "opening_hours"], "tags": {"landuse": "winter_sports"}, "terms": ["piste area", "ski area", "ski hill", "ski mountain", "ski resort", "snow board area", "snowboard area"], "name": "Winter Sports Area"},
     "leisure/adult_gaming_centre": {"icon": "temaki-casino", "fields": ["{amenity/casino}"], "moreFields": ["{amenity/casino}"], "geometry": ["point", "area"], "terms": ["gambling", "slot machine"], "tags": {"leisure": "adult_gaming_centre"}, "name": "Adult Gaming Center"},
-    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["driving simulators", "pay-to-play games", "pinball machines", "video games"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
+    "leisure/amusement_arcade": {"icon": "maki-gaming", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "level", "max_age", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["pay-to-play games", "video games", "driving simulators", "pinball machines"], "tags": {"leisure": "amusement_arcade"}, "name": "Amusement Arcade"},
     "leisure/bandstand": {"icon": "maki-music", "fields": ["name", "building_area", "operator"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bandstand"}, "name": "Bandstand"},
-    "leisure/beach_resort": {"icon": "fas-umbrella-beach", "fields": ["name", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "smoking", "website"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
+    "leisure/beach_resort": {"icon": "fas-umbrella-beach", "fields": ["name", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "beach_resort"}, "name": "Beach Resort"},
     "leisure/bird_hide": {"icon": "temaki-binoculars", "fields": ["name", "building_area", "address", "opening_hours"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"leisure": "bird_hide"}, "terms": ["machan", "ornithology"], "name": "Bird Hide"},
-    "leisure/bleachers": {"geometry": ["point", "area"], "tags": {"leisure": "bleachers"}, "terms": ["bench", "crowd", "seat", "seating", "sports", "stand", "stands"], "name": "Bleachers"},
+    "leisure/bleachers": {"geometry": ["point", "area"], "tags": {"leisure": "bleachers"}, "terms": ["crowd", "bench", "sports", "stand", "stands", "seat", "seating"], "name": "Bleachers"},
     "leisure/bowling_alley": {"icon": "temaki-bowling", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "opening_hours", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["bowling center"], "tags": {"leisure": "bowling_alley"}, "name": "Bowling Alley"},
     "leisure/common": {"icon": "temaki-pedestrian", "fields": ["name"], "moreFields": ["website"], "geometry": ["point", "area"], "terms": ["open space"], "tags": {"leisure": "common"}, "name": "Common"},
-    "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
-    "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["dance teaching", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
-    "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "flying disc golf", "frisbee golf", "frolf", "ultimate"], "name": "Disc Golf Course"},
-    "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
+    "leisure/dance": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["level", "opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["ballroom", "jive", "swing", "tango", "waltz"], "tags": {"leisure": "dance"}, "name": "Dance Hall"},
+    "leisure/dancing_school": {"icon": "maki-music", "fields": ["name", "operator", "address", "building_area", "dance/style"], "moreFields": ["level", "opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["jive", "swing", "tango", "waltz", "dance teaching"], "tags": {"leisure": "dance", "dance:teaching": "yes"}, "reference": {"key": "leisure", "value": "dance"}, "name": "Dance School"},
+    "leisure/disc_golf_course": {"icon": "temaki-disc_golf_basket", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "opening_hours"], "moreFields": ["address", "dog", "email", "fax", "lit", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"leisure": "disc_golf_course"}, "addTags": {"leisure": "disc_golf_course", "sport": "disc_golf"}, "terms": ["disk golf", "frisbee golf", "flying disc golf", "frolf", "ultimate"], "name": "Disc Golf Course"},
+    "leisure/dog_park": {"icon": "maki-dog-park", "fields": ["name"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": [], "tags": {"leisure": "dog_park"}, "name": "Dog Park"},
     "leisure/escape_game": {"icon": "fas-puzzle-piece", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["escape game", "escape the room", "puzzle room", "quest room"], "tags": {"leisure": "escape_game"}, "name": "Escape Room"},
-    "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["campfire", "fireplace"], "name": "Firepit"},
+    "leisure/firepit": {"icon": "maki-fire-station", "fields": ["access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "firepit"}, "terms": ["fireplace", "campfire"], "name": "Firepit"},
     "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"},
-    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["charge_fee", "email", "fax", "fee", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["gym", "health", "leisure", "studio"], "name": "Gym / Fitness Center"},
-    "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["asanas", "meditation", "modern yoga", "studio"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
+    "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["charge_fee", "opening_hours", "fee", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"},
+    "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["studio", "asanas", "modern yoga", "meditation"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"},
     "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"},
     "leisure/fitness_station/balance_beam": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "balance_beam"}, "addTags": {"leisure": "fitness_station", "fitness_station": "balance_beam", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["balance", "exercise", "fitness", "gym", "trim trail"], "name": "Exercise Balance Beam"},
     "leisure/fitness_station/box": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "box"}, "addTags": {"leisure": "fitness_station", "fitness_station": "box", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["box", "exercise", "fitness", "gym", "jump", "trim trail"], "name": "Exercise Box"},
-    "leisure/fitness_station/horizontal_bar": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar"}, "addTags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "chin up", "chinup", "exercise", "fitness", "gym", "pull up", "pullup", "trim trail"], "name": "Exercise Horizontal Bar"},
-    "leisure/fitness_station/horizontal_ladder": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "horizontal_ladder"}, "addTags": {"leisure": "fitness_station", "fitness_station": "horizontal_ladder", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "chin up", "chinup", "exercise", "fitness", "gym", "ladder", "monkey bars", "pull up", "pullup", "trim trail"], "name": "Exercise Monkey Bars"},
+    "leisure/fitness_station/horizontal_bar": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar"}, "addTags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "chinup", "chin up", "exercise", "fitness", "gym", "pullup", "pull up", "trim trail"], "name": "Exercise Horizontal Bar"},
+    "leisure/fitness_station/horizontal_ladder": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "horizontal_ladder"}, "addTags": {"leisure": "fitness_station", "fitness_station": "horizontal_ladder", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "chinup", "chin up", "exercise", "fitness", "gym", "ladder", "monkey bars", "pullup", "pull up", "trim trail"], "name": "Exercise Monkey Bars"},
     "leisure/fitness_station/hyperextension": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "hyperextension"}, "addTags": {"leisure": "fitness_station", "fitness_station": "hyperextension", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["back", "exercise", "extension", "fitness", "gym", "roman chair", "trim trail"], "name": "Hyperextension Station"},
     "leisure/fitness_station/parallel_bars": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "parallel_bars"}, "addTags": {"leisure": "fitness_station", "fitness_station": "parallel_bars", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "dip", "exercise", "fitness", "gym", "trim trail"], "name": "Parallel Bars"},
-    "leisure/fitness_station/push-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "push-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "push-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "exercise", "fitness", "gym", "push up", "pushup", "trim trail"], "name": "Push-Up Station"},
-    "leisure/fitness_station/rings": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "rings"}, "addTags": {"leisure": "fitness_station", "fitness_station": "rings", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "muscle up", "pull up", "pullup", "trim trail"], "name": "Exercise Rings"},
+    "leisure/fitness_station/push-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "push-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "push-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "exercise", "fitness", "gym", "pushup", "push up", "trim trail"], "name": "Push-Up Station"},
+    "leisure/fitness_station/rings": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "rings"}, "addTags": {"leisure": "fitness_station", "fitness_station": "rings", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "muscle up", "pullup", "pull up", "trim trail"], "name": "Exercise Rings"},
     "leisure/fitness_station/sign": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sign"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sign", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Exercise Instruction Sign"},
-    "leisure/fitness_station/sit-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sit-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sit-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["crunch", "exercise", "fitness", "gym", "sit up", "situp", "trim trail"], "name": "Sit-Up Station"},
+    "leisure/fitness_station/sit-up": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "sit-up"}, "addTags": {"leisure": "fitness_station", "fitness_station": "sit-up", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["crunch", "exercise", "fitness", "gym", "situp", "sit up", "trim trail"], "name": "Sit-Up Station"},
     "leisure/fitness_station/stairs": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "stairs"}, "addTags": {"leisure": "fitness_station", "fitness_station": "stairs", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "steps", "trim trail"], "name": "Exercise Stairs"},
-    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
-    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
-    "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["hacklab", "hackspace", "makerspace"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
-    "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["email", "fax", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
-    "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["email", "fax", "level", "opening_hours", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["curling", "hockey", "skating"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
-    "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "seamark/type", "website"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
-    "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
-    "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "phone", "website"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
-    "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "bar", "beer garden", "cafe", "dining", "patio", "pub", "restaurant"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
-    "leisure/park": {"icon": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "email", "fax", "phone", "smoking", "website"], "geometry": ["point", "area"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
+    "leisure/garden": {"icon": "maki-garden", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "tags": {"leisure": "garden"}, "name": "Garden"},
+    "leisure/golf_course": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["links"], "tags": {"leisure": "golf_course"}, "name": "Golf Course"},
+    "leisure/hackerspace": {"icon": "fas-code", "fields": ["name", "address", "building_area", "opening_hours", "website", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["makerspace", "hackspace", "hacklab"], "tags": {"leisure": "hackerspace"}, "name": "Hackerspace"},
+    "leisure/horse_riding": {"icon": "maki-horse-riding", "fields": ["name", "access_simple", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["equestrian", "stable"], "tags": {"leisure": "horse_riding"}, "name": "Horseback Riding Facility"},
+    "leisure/ice_rink": {"icon": "fas-skating", "fields": ["name", "seasonal", "sport_ice", "operator", "address", "building"], "moreFields": ["opening_hours", "payment_multi", "level", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["hockey", "skating", "curling"], "tags": {"leisure": "ice_rink"}, "name": "Ice Rink"},
+    "leisure/marina": {"icon": "tnp-2009223", "fields": ["name", "operator", "capacity", "fee", "payment_multi_fee", "charge_fee", "sanitary_dump_station", "power_supply"], "moreFields": ["address", "internet_access", "internet_access/fee", "internet_access/ssid", "seamark/type", "website", "phone", "email", "fax"], "geometry": ["point", "vertex", "area"], "terms": ["boat"], "tags": {"leisure": "marina"}, "name": "Marina"},
+    "leisure/miniature_golf": {"icon": "maki-golf", "fields": ["name", "operator", "address", "opening_hours", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["crazy golf", "mini golf", "putt-putt"], "tags": {"leisure": "miniature_golf"}, "name": "Miniature Golf"},
+    "leisure/nature_reserve": {"icon": "maki-park", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "website", "phone", "email", "fax"], "tags": {"leisure": "nature_reserve"}, "terms": ["protected", "wildlife"], "name": "Nature Reserve"},
+    "leisure/outdoor_seating": {"icon": "maki-picnic-site", "geometry": ["point", "area"], "fields": ["name", "operator"], "moreFields": ["level"], "terms": ["al fresco", "beer garden", "dining", "cafe", "restaurant", "pub", "bar", "patio"], "tags": {"leisure": "outdoor_seating"}, "name": "Outdoor Seating Area"},
+    "leisure/park": {"icon": "maki-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["dog", "smoking", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["esplanade", "estate", "forest", "garden", "grass", "green", "grounds", "lawn", "lot", "meadow", "parkland", "place", "playground", "plaza", "pleasure garden", "recreation area", "square", "tract", "village green", "woodland"], "tags": {"leisure": "park"}, "name": "Park"},
     "leisure/picnic_table": {"icon": "maki-picnic-site", "fields": ["material", "lit", "bench"], "moreFields": ["level"], "geometry": ["point"], "tags": {"leisure": "picnic_table"}, "terms": ["bench"], "name": "Picnic Table"},
-    "leisure/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "checkerboard", "checkers", "chequerboard", "chess board", "game table"], "name": "Chess Table"},
+    "leisure/picnic_table/chess": {"icon": "fas-chess-pawn", "geometry": ["point"], "tags": {"leisure": "picnic_table", "sport": "chess"}, "reference": {"key": "sport", "value": "chess"}, "terms": ["bench", "chess board", "checkerboard", "checkers", "chequerboard", "game table"], "name": "Chess Table"},
     "leisure/pitch": {"icon": "maki-pitch", "fields": ["name", "sport", "access_simple", "surface", "lit"], "moreFields": ["charge_fee", "covered", "fee", "indoor", "payment_multi_fee"], "geometry": ["point", "area"], "tags": {"leisure": "pitch"}, "terms": ["field"], "name": "Sport Pitch"},
     "leisure/pitch/american_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "american_football"}, "reference": {"key": "sport", "value": "american_football"}, "terms": ["football", "gridiron"], "name": "American Football Field"},
-    "leisure/pitch/australian_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "australian_football"}, "reference": {"key": "sport", "value": "australian_football"}, "terms": ["AFL", "Aussie", "football"], "name": "Australian Football Field"},
+    "leisure/pitch/australian_football": {"icon": "maki-american-football", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "australian_football"}, "reference": {"key": "sport", "value": "australian_football"}, "terms": ["Aussie", "AFL", "football"], "name": "Australian Football Field"},
     "leisure/pitch/badminton": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "badminton"}, "reference": {"key": "sport", "value": "badminton"}, "terms": [], "name": "Badminton Court"},
     "leisure/pitch/baseball": {"icon": "maki-baseball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "baseball"}, "reference": {"key": "sport", "value": "baseball"}, "terms": [], "name": "Baseball Field"},
     "leisure/pitch/basketball": {"icon": "maki-basketball", "fields": ["name", "surface", "hoops", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "basketball"}, "reference": {"key": "sport", "value": "basketball"}, "terms": [], "name": "Basketball Court"},
@@ -679,38 +679,38 @@
     "leisure/pitch/shuffleboard": {"icon": "temaki-shuffleboard", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "shuffleboard"}, "reference": {"key": "sport", "value": "shuffleboard"}, "terms": ["deck shuffleboard", "floor shuffleboard"], "name": "Shuffleboard Court"},
     "leisure/pitch/skateboard": {"icon": "maki-skateboard", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "skateboard"}, "reference": {"key": "sport", "value": "skateboard"}, "terms": [], "name": "Skate Park"},
     "leisure/pitch/soccer": {"icon": "maki-soccer", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "soccer"}, "reference": {"key": "sport", "value": "soccer"}, "terms": ["football"], "name": "Soccer Field"},
-    "leisure/pitch/softball": {"icon": "maki-baseball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "softball"}, "reference": {"key": "sport", "value": "softball"}, "terms": ["diamond", "softball"], "name": "Softball Field"},
-    "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["ping pong", "table tennis"], "name": "Ping Pong Table"},
+    "leisure/pitch/softball": {"icon": "maki-baseball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "softball"}, "reference": {"key": "sport", "value": "softball"}, "terms": ["softball", "diamond"], "name": "Softball Field"},
+    "leisure/pitch/table_tennis": {"icon": "maki-tennis", "fields": ["name", "lit", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "table_tennis"}, "reference": {"key": "sport", "value": "table_tennis"}, "terms": ["table tennis", "ping pong"], "name": "Ping Pong Table"},
     "leisure/pitch/tennis": {"icon": "maki-tennis", "fields": ["{leisure/pitch}", "access_simple"], "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "tennis"}, "reference": {"key": "sport", "value": "tennis"}, "terms": [], "name": "Tennis Court"},
     "leisure/pitch/volleyball": {"icon": "maki-volleyball", "geometry": ["point", "area"], "tags": {"leisure": "pitch", "sport": "volleyball"}, "reference": {"key": "sport", "value": "volleyball"}, "terms": [], "name": "Volleyball Court"},
     "leisure/playground": {"icon": "maki-playground", "fields": ["name", "operator", "playground/theme", "surface", "access_simple", "min_age", "max_age"], "moreFields": ["blind", "dog", "wheelchair"], "geometry": ["point", "area"], "terms": ["jungle gym", "play area"], "tags": {"leisure": "playground"}, "name": "Playground"},
     "leisure/resort": {"icon": "maki-lodging", "fields": ["name", "operator", "resort", "address", "opening_hours"], "moreFields": ["access_simple", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "resort"}, "terms": ["recreation center", "sanatorium", "ski and snowboard resort", "vacation resort", "winter sports resort"], "name": "Resort"},
-    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "level", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
-    "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat landing", "boat launch", "boat ramp"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
-    "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "surface", "access_simple", "fee", "payment_multi_fee", "charge_fee", "lanes"], "moreFields": ["lit", "opening_hours", "seamark/type", "width"], "geometry": ["line"], "terms": ["boat landing", "boat launch", "boat ramp"], "tags": {"leisure": "slipway"}, "addTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "matchScore": 1.1, "name": "Slipway"},
-    "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
-    "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "indoor rock wall", "rappeling", "rock climbing facility", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"},
+    "leisure/sauna": {"icon": "fas-thermometer-three-quarters", "fields": ["name", "operator", "address", "opening_hours", "access_simple", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["level", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sauna"}, "name": "Sauna"},
+    "leisure/slipway_point": {"icon": "maki-slipway", "fields": ["{leisure/slipway}"], "moreFields": ["{leisure/slipway}"], "geometry": ["point", "vertex"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "name": "Slipway"},
+    "leisure/slipway": {"icon": "maki-slipway", "fields": ["name", "surface", "access_simple", "fee", "payment_multi_fee", "charge_fee", "lanes"], "moreFields": ["lit", "opening_hours", "seamark/type", "width"], "geometry": ["line"], "terms": ["boat launch", "boat ramp", "boat landing"], "tags": {"leisure": "slipway"}, "addTags": {"leisure": "slipway", "highway": "service", "service": "slipway"}, "matchScore": 1.1, "name": "Slipway"},
+    "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"},
+    "leisure/sports_centre/climbing": {"icon": "temaki-abseiling", "geometry": ["point", "area"], "terms": ["abseiling", "artificial climbing wall", "belaying", "bouldering", "rock climbing facility", "indoor rock wall", "rappeling", "rock gym", "ropes"], "tags": {"leisure": "sports_centre", "sport": "climbing"}, "reference": {"key": "sport", "value": "climbing"}, "name": "Climbing Gym"},
     "leisure/sports_centre/swimming": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"},
-    "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
-    "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["aquatics", "dive", "water"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
-    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["aquatics", "dive", "water"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
+    "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"},
+    "leisure/swimming_area": {"icon": "fas-swimmer", "fields": ["name", "access_simple", "supervised", "fee", "payment_multi_fee", "charge_fee", "lit"], "moreFields": ["opening_hours", "operator"], "geometry": ["area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_area"}, "name": "Natural Swimming Area"},
+    "leisure/swimming_pool": {"icon": "fas-swimming-pool", "fields": ["name", "access_simple", "lit", "location_pool", "length", "swimming_pool"], "moreFields": ["address", "level", "opening_hours", "operator"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"},
     "leisure/track": {"icon": "iD-other-line", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "moreFields": ["access", "covered", "indoor", "level"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"},
     "leisure/track/cycling_point": {"icon": "fas-biking", "fields": ["{leisure/track/cycling}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
     "leisure/track/cycling": {"icon": "fas-biking", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "cycling"}, "terms": ["bicycle track", "bicycling track", "cycle racetrack", "velodrome"], "name": "Cycling Track"},
-    "leisure/track/horse_racing_point": {"icon": "maki-horse-riding", "fields": ["{leisure/track/horse_racing}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horse racetrack", "horseracing", "horsetrack"], "name": "Horse Racing Track"},
-    "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horse racetrack", "horseracing", "horsetrack"], "name": "Horse Racing Track"},
+    "leisure/track/horse_racing_point": {"icon": "maki-horse-riding", "fields": ["{leisure/track/horse_racing}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
+    "leisure/track/horse_racing": {"icon": "maki-horse-riding", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "horse_racing"}, "terms": ["equestrian race track", "horse race betting", "horseracing", "horsetrack", "horse racetrack"], "name": "Horse Racing Track"},
     "leisure/track/running_point": {"icon": "maki-pitch", "fields": ["{leisure/track/running}"], "geometry": ["point"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
     "leisure/track/running": {"icon": "maki-pitch", "fields": ["name", "surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["line", "area"], "tags": {"leisure": "track", "sport": "running"}, "terms": ["athletics track", "decathlon", "foot race", "long distance running", "marathon", "middle distance running", "racetrack", "running", "sprint", "track", "walking"], "name": "Running Track"},
-    "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["brand", "email", "fax", "payment_multi", "phone", "website"], "geometry": ["point", "area"], "terms": ["dive", "pool", "swim"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
+    "leisure/water_park": {"icon": "fas-swimmer", "fields": ["name", "operator", "address"], "moreFields": ["payment_multi", "brand", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"},
     "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "terms": ["polyline"], "name": "Line", "matchScore": 0.1},
     "man_made/adit": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource", "direction"], "terms": ["cave", "horizontal mine entrance", "tunnel", "underground"], "tags": {"man_made": "adit"}, "name": "Adit"},
-    "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell", "cell phone", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
+    "man_made/antenna": {"icon": "temaki-antenna", "fields": ["communication_multi", "operator", "manufacturer", "height"], "geometry": ["point"], "terms": ["broadcast", "cell phone", "cell", "communication", "mobile phone", "radio", "television", "transmission", "tv"], "tags": {"man_made": "antenna"}, "name": "Antenna"},
     "man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5},
     "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
     "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
     "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge", "matchScore": 0.85},
     "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
-    "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["càrn", "rock pile", "stone pile", "stone stack"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
+    "man_made/cairn": {"icon": "temaki-cairn", "geometry": ["point", "area"], "terms": ["rock pile", "stone stack", "stone pile", "càrn"], "tags": {"man_made": "cairn"}, "name": "Cairn"},
     "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
     "man_made/crane": {"icon": "temaki-crane", "fields": ["operator", "manufacturer", "height", "crane/type"], "geometry": ["point", "line", "vertex", "area"], "tags": {"man_made": "crane"}, "name": "Crane"},
@@ -722,48 +722,48 @@
     "man_made/gasometer": {"icon": "temaki-storage_tank", "fields": ["content", "building_area"], "geometry": ["point", "area"], "terms": ["gas holder"], "tags": {"man_made": "gasometer"}, "name": "Gasometer"},
     "man_made/groyne": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "groyne"}, "name": "Groyne"},
     "man_made/lighthouse": {"icon": "maki-lighthouse", "fields": ["name", "operator", "building_area", "height"], "moreFields": ["address", "email", "fax", "phone", "seamark/type", "website"], "geometry": ["point", "area"], "tags": {"man_made": "lighthouse"}, "addTags": {"man_made": "lighthouse", "seamark:type": "light_major"}, "removeTags": {"man_made": "lighthouse", "seamark:type": "*"}, "name": "Lighthouse"},
-    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["communication_multi", "manufacturer", "material"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
+    "man_made/mast": {"icon": "maki-communications-tower", "fields": ["tower/type", "tower/construction", "height"], "moreFields": ["manufacturer", "material", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast"}, "name": "Mast"},
     "man_made/mast/communication": {"icon": "maki-communications-tower", "fields": ["{man_made/mast}", "communication_multi"], "geometry": ["point"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Mast"},
     "man_made/mast/communication/mobile_phone": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "cell mast", "cell phone mast", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:mobile_phone": "yes"}, "reference": {"key": "communication:mobile_phone", "value": "yes"}, "name": "Mobile Phone Mast"},
     "man_made/mast/communication/radio": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "radio mast", "radio tower", "transmission mast", "transmission tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:radio": "yes"}, "reference": {"key": "communication:radio", "value": "yes"}, "name": "Radio Broadcast Mast"},
     "man_made/mast/communication/television": {"icon": "maki-communications-tower", "geometry": ["point"], "terms": ["antenna", "broadcast tower", "communication mast", "communication tower", "guyed tower", "television mast", "television tower", "transmission mast", "transmission tower", "tv mast", "tv tower"], "tags": {"man_made": "mast", "tower:type": "communication", "communication:television": "yes"}, "reference": {"key": "communication:television", "value": "yes"}, "name": "Television Broadcast Mast"},
     "man_made/mineshaft": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "operator", "resource"], "terms": ["cave", "mine shaft", "tunnel", "underground", "vertical mine entrance"], "tags": {"man_made": "mineshaft"}, "name": "Mineshaft"},
-    "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["air", "earthquake", "gps", "seismology", "weather"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
+    "man_made/monitoring_station": {"icon": "temaki-antenna", "geometry": ["point", "vertex", "area"], "fields": ["monitoring_multi", "operator", "manufacturer"], "terms": ["weather", "earthquake", "seismology", "air", "gps"], "tags": {"man_made": "monitoring_station"}, "name": "Monitoring Station"},
     "man_made/obelisk": {"icon": "maki-monument", "fields": ["name", "inscription", "height", "material", "colour"], "geometry": ["point", "vertex", "area"], "tags": {"man_made": "obelisk"}, "name": "Obelisk"},
-    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
-    "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil pump", "oil rig", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
-    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["{highway/footway}", "access", "fishing", "incline"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
+    "man_made/observatory": {"fields": ["name", "operator", "address", "access_simple", "building_area"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["astronomical", "meteorological"], "tags": {"man_made": "observatory"}, "name": "Observatory"},
+    "man_made/petroleum_well": {"icon": "temaki-storage_tank", "geometry": ["point"], "terms": ["drilling rig", "oil derrick", "oil drill", "oil horse", "oil rig", "oil pump", "petroleum well", "pumpjack"], "tags": {"man_made": "petroleum_well"}, "name": "Oil Well"},
+    "man_made/pier": {"icon": "temaki-pedestrian", "fields": ["name", "surface", "floating", "width", "access", "lit"], "moreFields": ["access", "fishing", "incline", "{highway/footway}"], "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier"}, "name": "Pier"},
     "man_made/pier/floating": {"icon": "temaki-pedestrian", "geometry": ["line", "area"], "terms": ["berth", "dock", "jetty", "landing", "promenade", "wharf"], "tags": {"man_made": "pier", "floating": "yes"}, "addTags": {"highway": "footway", "man_made": "pier", "floating": "yes"}, "name": "Floating Pier"},
-    "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["operator", "location", "substance", "layer", "diameter"], "geometry": ["line"], "terms": ["natural gas", "oil", "sewage", "sewer", "water"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
-    "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["natural gas", "oil", "sewage", "sewer", "water"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
-    "man_made/pipeline/valve": {"geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["natural gas", "oil", "sewage", "sewer", "water"], "tags": {"man_made": "pipeline", "pipeline": "valve"}, "name": "Pipeline Valve"},
+    "man_made/pipeline": {"icon": "iD-pipeline-line", "fields": ["operator", "location", "substance", "layer", "diameter"], "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline"}, "name": "Pipeline"},
+    "man_made/pipeline/underground": {"icon": "iD-pipeline-line", "geometry": ["line"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "location": "underground"}, "addTags": {"man_made": "pipeline", "location": "underground", "layer": "-1"}, "name": "Underground Pipeline"},
+    "man_made/pipeline/valve": {"geometry": ["vertex"], "fields": ["ref", "operator", "valve", "location", "diameter"], "moreFields": ["colour", "manufacturer", "material"], "terms": ["oil", "natural gas", "water", "sewer", "sewage"], "tags": {"man_made": "pipeline", "pipeline": "valve"}, "name": "Pipeline Valve"},
     "man_made/pumping_station": {"icon": "maki-water", "geometry": ["point", "area"], "tags": {"man_made": "pumping_station"}, "name": "Pumping Station"},
-    "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["corn", "grain", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
-    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["gas", "oil", "petrol", "water"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
+    "man_made/silo": {"icon": "temaki-silo", "fields": ["crop", "building_area"], "geometry": ["point", "area"], "terms": ["grain", "corn", "wheat"], "tags": {"man_made": "silo"}, "name": "Silo"},
+    "man_made/storage_tank": {"icon": "temaki-storage_tank", "fields": ["content", "operator", "material", "building_area", "height", "capacity"], "moreFields": ["layer", "location", "manufacturer"], "geometry": ["point", "area"], "terms": ["water", "oil", "gas", "petrol"], "tags": {"man_made": "storage_tank"}, "name": "Storage Tank"},
     "man_made/storage_tank/water": {"icon": "temaki-storage_tank", "geometry": ["point", "area"], "terms": ["cistern", "water tower"], "tags": {"man_made": "storage_tank", "content": "water"}, "name": "Water Tank"},
     "man_made/street_cabinet": {"icon": "fas-door-closed", "geometry": ["point", "area"], "fields": ["ref", "operator", "street_cabinet", "height", "colour"], "terms": ["cable tv", "monitoring box", "technical box", "telecommunications", "traffic signal controls"], "tags": {"man_made": "street_cabinet"}, "name": "Street Cabinet"},
-    "man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["alpr", "anpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
-    "man_made/surveillance/camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["alpr", "anpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
-    "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["triangulation pillar", "trig point", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"},
+    "man_made/surveillance": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "surveillance/zone", "direction"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance"}, "name": "Surveillance"},
+    "man_made/surveillance/camera": {"icon": "temaki-security_camera", "geometry": ["point", "vertex"], "fields": ["surveillance", "surveillance/type", "camera/type", "camera/mount", "camera/direction", "surveillance/zone", "contact/webcam"], "moreFields": ["manufacturer"], "terms": ["anpr", "alpr", "camera", "car plate recognition", "cctv", "guard", "license plate recognition", "monitoring", "number plate recognition", "security", "video", "webcam"], "tags": {"man_made": "surveillance", "surveillance:type": "camera"}, "name": "Surveillance Camera"},
+    "man_made/survey_point": {"icon": "maki-monument", "fields": ["ref"], "geometry": ["point", "vertex"], "terms": ["trig point", "triangulation pillar", "trigonometrical station"], "tags": {"man_made": "survey_point"}, "name": "Survey Point"},
     "man_made/torii": {"icon": "temaki-shinto", "fields": ["height", "material", "colour", "lit"], "moreFields": ["name", "operator", "ref"], "geometry": ["point", "vertex", "line"], "terms": ["Japanese gate", "Shinto shrine"], "tags": {"man_made": "torii"}, "name": "Torii"},
     "man_made/tower": {"icon": "temaki-tower", "fields": ["tower/type", "tower/construction", "height", "building_area"], "moreFields": ["architect"], "geometry": ["point", "area"], "tags": {"man_made": "tower"}, "name": "Tower"},
     "man_made/tower/bell_tower": {"icon": "fas-bell", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["belfry", "bell gable", "campanile", "church tower", "klockstapel"], "tags": {"man_made": "tower", "tower:type": "bell_tower"}, "reference": {"key": "tower:type", "value": "bell_tower"}, "name": "Bell Tower"},
     "man_made/tower/communication": {"icon": "temaki-tower", "fields": ["{man_made/tower}", "communication_multi"], "geometry": ["point", "area"], "terms": ["antenna", "broadcast tower", "cell phone tower", "cell tower", "communication mast", "communication tower", "guyed tower", "mobile phone tower", "radio mast", "radio tower", "television tower", "transmission mast", "transmission tower", "tv tower"], "tags": {"man_made": "tower", "tower:type": "communication"}, "reference": {"key": "tower:type", "value": "communication"}, "name": "Communication Tower"},
-    "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Castle Tower", "Defensive Tower"], "name": "Fortified Tower"},
+    "man_made/tower/defensive": {"icon": "maki-castle", "geometry": ["point", "area"], "tags": {"man_made": "tower", "tower:type": "defensive"}, "reference": {"key": "tower:type", "value": "defensive"}, "terms": ["Defensive Tower", "Castle Tower"], "name": "Fortified Tower"},
     "man_made/tower/minaret": {"icon": "temaki-tower", "geometry": ["point", "area"], "terms": ["Islam", "mosque", "Muezzin", "Muslim"], "tags": {"man_made": "tower", "tower:type": "minaret"}, "reference": {"key": "tower:type", "value": "minaret"}, "name": "Minaret"},
-    "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["fire tower", "lookout tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
+    "man_made/tower/observation": {"icon": "temaki-tower", "moreFields": ["{man_made/tower}", "opening_hours"], "geometry": ["point", "area"], "terms": ["lookout tower", "fire tower"], "tags": {"man_made": "tower", "tower:type": "observation"}, "reference": {"key": "tower:type", "value": "observation"}, "name": "Observation Tower"},
     "man_made/tunnel": {"icon": "tnp-2009642", "fields": ["name", "tunnel", "layer", "width", "length", "height"], "geometry": ["area"], "tags": {"man_made": "tunnel"}, "addTags": {"man_made": "tunnel", "layer": "-1"}, "removeTags": {"man_made": "tunnel", "layer": "*"}, "reference": {"key": "man_made", "value": "tunnel"}, "terms": ["bore", "dig", "shaft", "underground passage", "underpass"], "name": "Tunnel"},
     "man_made/utility_pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material"], "moreFields": ["colour", "manufacturer"], "geometry": ["point", "vertex"], "tags": {"man_made": "utility_pole"}, "name": "Utility Pole"},
-    "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["reclamation plant", "sewage*", "water treatment plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
+    "man_made/wastewater_plant": {"icon": "maki-water", "fields": ["name", "operator", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["sewage*", "water treatment plant", "reclamation plant"], "tags": {"man_made": "wastewater_plant"}, "name": "Wastewater Plant"},
     "man_made/water_tower": {"icon": "maki-water", "fields": ["operator", "height"], "geometry": ["point", "area"], "tags": {"man_made": "water_tower"}, "name": "Water Tower"},
     "man_made/water_well": {"icon": "maki-water", "fields": ["operator"], "geometry": ["point", "area"], "tags": {"man_made": "water_well"}, "name": "Water Well"},
     "man_made/water_works": {"icon": "maki-water", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "tags": {"man_made": "water_works"}, "name": "Water Works"},
-    "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["mill", "water", "wheel"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
-    "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["mill", "wheel", "wind"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
-    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["email", "fax", "phone", "website"], "geometry": ["point", "area"], "terms": ["assembly", "brewery", "build", "car", "manufacture", "plant", "plastic", "processing", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
-    "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewage", "sewer", "telecom"], "name": "Manhole"},
-    "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewage", "sewer", "storm"], "name": "Storm Drain"},
-    "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["bt", "cover", "hole", "phone", "telecom", "telephone"], "name": "Telecom Manhole"},
+    "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
+    "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
+    "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
+    "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
+    "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
+    "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"},
     "military/bunker": {"icon": "temaki-military", "fields": ["name", "bunker_type", "building_area"], "geometry": ["point", "area"], "tags": {"military": "bunker"}, "addTags": {"building": "bunker", "military": "bunker"}, "terms": ["air force", "army", "base", "fight", "force", "guard", "marine", "navy", "troop", "war"], "name": "Military Bunker"},
     "military/checkpoint": {"icon": "maki-barrier", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "checkpoint"}, "terms": ["air force", "army", "base", "force", "guard", "marine", "navy", "troop", "war"], "name": "Checkpoint"},
     "military/nuclear_explosion_site": {"icon": "maki-danger", "fields": ["name"], "geometry": ["point", "vertex", "area"], "tags": {"military": "nuclear_explosion_site"}, "terms": ["atom", "blast", "bomb", "detonat*", "nuke", "site", "test"], "name": "Nuclear Explosion Site"},
@@ -773,7 +773,7 @@
     "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "line", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
     "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"},
     "natural/cape": {"icon": "temaki-beach", "fields": ["name", "elevation", "description"], "geometry": ["point"], "tags": {"natural": "cape"}, "terms": ["bay", "coastline", "erosion", "headland", "promontory"], "name": "Cape"},
-    "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "elevation", "access_simple", "direction", "fee", "payment_multi_fee", "charge_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "cavity", "grotto", "hollow", "shelter"], "name": "Cave Entrance"},
+    "natural/cave_entrance": {"icon": "maki-triangle", "geometry": ["point", "area"], "fields": ["name", "elevation", "access_simple", "direction", "fee", "payment_multi_fee", "charge_fee"], "tags": {"natural": "cave_entrance"}, "terms": ["cavern", "hollow", "grotto", "shelter", "cavity"], "name": "Cave Entrance"},
     "natural/cliff": {"icon": "maki-triangle", "fields": ["name", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "cliff"}, "terms": ["crag", "escarpment", "rock face", "scarp"], "name": "Cliff"},
     "natural/coastline": {"geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"},
     "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"},
@@ -784,32 +784,32 @@
     "natural/peak": {"icon": "maki-mountain", "fields": ["name", "elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"},
     "natural/reef": {"icon": "temaki-beach", "geometry": ["point", "area"], "tags": {"natural": "reef"}, "terms": ["barrier", "coral", "ocean", "sand", "shoal"], "name": "Reef"},
     "natural/ridge": {"geometry": ["line"], "tags": {"natural": "ridge"}, "terms": ["crest"], "name": "Ridge"},
-    "natural/rock": {"icon": "temaki-boulder2", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "rock"}, "terms": ["boulder", "rock", "stone"], "name": "Attached Rock / Boulder"},
-    "natural/saddle": {"icon": "maki-triangle-stroked", "fields": ["elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "saddle"}, "terms": ["mountain pass", "pass", "top"], "name": "Saddle"},
+    "natural/rock": {"icon": "temaki-boulder2", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "rock"}, "terms": ["boulder", "stone", "rock"], "name": "Attached Rock / Boulder"},
+    "natural/saddle": {"icon": "maki-triangle-stroked", "fields": ["elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "saddle"}, "terms": ["pass", "mountain pass", "top"], "name": "Saddle"},
     "natural/sand": {"geometry": ["area"], "tags": {"natural": "sand"}, "terms": ["desert"], "name": "Sand"},
     "natural/scree": {"geometry": ["area"], "tags": {"natural": "scree"}, "terms": ["loose rocks"], "name": "Scree"},
     "natural/scrub": {"geometry": ["area"], "tags": {"natural": "scrub"}, "terms": ["bush", "shrubs"], "name": "Scrub"},
     "natural/shingle": {"geometry": ["area"], "tags": {"natural": "shingle"}, "terms": ["beach", "gravel", "pebbles", "riverbed", "rounded rock fragments"], "name": "Shingle"},
     "natural/spring": {"icon": "maki-water", "fields": ["name", "intermittent"], "geometry": ["point", "vertex"], "tags": {"natural": "spring"}, "terms": [], "name": "Spring"},
-    "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "rock", "stone"], "name": "Unattached Stone / Boulder"},
+    "natural/stone": {"icon": "temaki-boulder1", "fields": ["name"], "geometry": ["point", "area"], "tags": {"natural": "stone"}, "terms": ["boulder", "stone", "rock"], "name": "Unattached Stone / Boulder"},
     "natural/tree_row": {"icon": "maki-park", "fields": ["leaf_type", "leaf_cycle", "denotation"], "geometry": ["line"], "tags": {"natural": "tree_row"}, "terms": [], "name": "Tree Row"},
     "natural/tree": {"icon": "maki-park", "fields": ["leaf_type_singular", "leaf_cycle_singular", "denotation", "diameter"], "moreFields": ["species/wikidata"], "geometry": ["point", "vertex"], "tags": {"natural": "tree"}, "terms": [], "name": "Tree"},
-    "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gulley", "gully", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"},
-    "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["crater", "mountain"], "name": "Volcano"},
+    "natural/valley": {"icon": "maki-triangle-stroked", "fields": ["name", "elevation", "description"], "geometry": ["vertex", "point", "line"], "tags": {"natural": "valley"}, "terms": ["canyon", "dale", "dell", "dene", "depression", "glen", "gorge", "gully", "gulley", "gultch", "hollow", "ravine", "rift", "vale"], "name": "Valley"},
+    "natural/volcano": {"icon": "maki-volcano", "fields": ["name", "elevation", "volcano/status", "volcano/type"], "geometry": ["point", "vertex"], "tags": {"natural": "volcano"}, "terms": ["mountain", "crater"], "name": "Volcano"},
     "natural/water": {"icon": "maki-water", "fields": ["name", "water", "intermittent"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water"}, "name": "Water"},
     "natural/water/basin": {"icon": "maki-water", "fields": ["name", "basin", "intermittent_yes"], "geometry": ["area"], "tags": {"natural": "water", "water": "basin"}, "reference": {"key": "water", "value": "basin"}, "terms": ["detention", "drain", "overflow", "rain", "retention"], "name": "Basin"},
     "natural/water/canal": {"icon": "iD-waterway-canal", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "canal"}, "reference": {"key": "water", "value": "canal"}, "name": "Canal"},
     "natural/water/lake": {"icon": "maki-water", "fields": ["{natural/water}", "salt", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "lake"}, "reference": {"key": "water", "value": "lake"}, "terms": ["lakelet", "loch", "mere"], "name": "Lake"},
     "natural/water/moat": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "moat"}, "name": "Moat"},
-    "natural/water/pond": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "mere", "millpond", "pool", "tarn"], "name": "Pond"},
+    "natural/water/pond": {"icon": "maki-water", "fields": ["{natural/water}", "salt"], "geometry": ["area"], "tags": {"natural": "water", "water": "pond"}, "reference": {"key": "water", "value": "pond"}, "terms": ["lakelet", "millpond", "tarn", "pool", "mere"], "name": "Pond"},
     "natural/water/reservoir": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "reservoir"}, "reference": {"key": "water", "value": "reservoir"}, "name": "Reservoir"},
     "natural/water/river": {"icon": "iD-waterway-river", "fields": ["{natural/water}", "tidal"], "geometry": ["area"], "tags": {"natural": "water", "water": "river"}, "reference": {"key": "water", "value": "river"}, "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "riverbank", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "name": "River"},
     "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream"},
-    "natural/water/wastewater": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["Clarifier Basin", "excrement", "Settling Basin", "sewage", "shit", "wastewater"], "name": "Wastewater Basin"},
+    "natural/water/wastewater": {"icon": "maki-water", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"},
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
     "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree"], "name": "Wood"},
-    "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["dead end", "no exit", "road end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
-    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
+    "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
+    "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
     "office/administrative": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "administrative"}, "terms": [], "searchable": false, "name": "Administrative Office"},
     "office/physician": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "physician"}, "searchable": false, "name": "Physician"},
     "office/travel_agent": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "travel_agent"}, "reference": {"key": "shop", "value": "travel_agency"}, "terms": [], "name": "Travel Agency", "searchable": false},
@@ -830,12 +830,12 @@
     "office/employment_agency": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "employment_agency"}, "terms": ["job"], "name": "Employment Agency"},
     "office/energy_supplier": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "energy_supplier"}, "terms": ["electricity", "energy company", "energy utility", "gas utility"], "name": "Energy Supplier Office"},
     "office/estate_agent": {"icon": "temaki-real_estate_agency", "geometry": ["point", "area"], "tags": {"office": "estate_agent"}, "terms": ["real estate"], "name": "Real Estate Office"},
-    "office/financial_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial_advisor"}, "terms": ["401k", "inheritance", "retirement", "savings", "stocks", "wealth management"], "name": "Financial Advisor"},
+    "office/financial_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial_advisor"}, "terms": ["401k", "inheritance", "savings", "stocks", "retirement", "wealth management"], "name": "Financial Advisor"},
     "office/financial": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "financial"}, "terms": [], "name": "Financial Office"},
     "office/forestry": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "forestry"}, "terms": ["forest", "ranger"], "name": "Forestry Office"},
     "office/foundation": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "foundation"}, "terms": [], "name": "Foundation Office"},
     "office/government": {"icon": "maki-town-hall", "fields": ["name", "government", "{office}"], "geometry": ["point", "area"], "tags": {"office": "government"}, "terms": [], "name": "Government Office"},
-    "office/government/register_office": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["birth", "certificate", "clerk", "death", "marriage"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"},
+    "office/government/register_office": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["clerk", "marriage", "death", "birth", "certificate"], "tags": {"office": "government", "government": "register_office"}, "reference": {"key": "government", "value": "register_office"}, "name": "Register Office"},
     "office/government/tax": {"icon": "maki-town-hall", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "terms": ["fiscal authorities", "revenue office", "tax office"], "tags": {"office": "government", "government": "tax"}, "reference": {"key": "government", "value": "tax"}, "name": "Tax and Revenue Office"},
     "office/guide": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "guide"}, "terms": ["dive guide", "mountain guide", "tour guide"], "name": "Tour Guide Office"},
     "office/insurance": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "insurance"}, "terms": [], "name": "Insurance Office"},
@@ -844,27 +844,27 @@
     "office/lawyer/notary": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "lawyer", "lawyer": "notary"}, "reference": {"key": "office", "value": "notary"}, "searchable": false, "name": "Notary Office"},
     "office/moving_company": {"icon": "fas-people-carry", "geometry": ["point", "area"], "tags": {"office": "moving_company"}, "terms": ["relocation"], "name": "Moving Company Office"},
     "office/newspaper": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"office": "newspaper"}, "terms": [], "name": "Newspaper Office"},
-    "office/ngo": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "ngo"}, "terms": ["ngo", "non government", "non-government", "organisation", "organization"], "name": "NGO Office"},
+    "office/ngo": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "ngo"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation"], "name": "NGO Office"},
     "office/notary": {"icon": "fas-stamp", "geometry": ["point", "area"], "tags": {"office": "notary"}, "terms": ["clerk", "deeds", "estate", "signature", "wills"], "name": "Notary Office"},
     "office/political_party": {"icon": "maki-town-hall", "geometry": ["point", "area"], "tags": {"office": "political_party"}, "terms": [], "name": "Political Party Office"},
-    "office/private_investigator": {"icon": "fas-user-secret", "geometry": ["point", "area"], "tags": {"office": "private_investigator"}, "terms": ["PI", "private detective", "private eye"], "name": "Private Investigator Office"},
-    "office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organisation", "organization", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"},
+    "office/private_investigator": {"icon": "fas-user-secret", "geometry": ["point", "area"], "tags": {"office": "private_investigator"}, "terms": ["PI", "private eye", "private detective"], "name": "Private Investigator Office"},
+    "office/quango": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "quango"}, "terms": ["ngo", "non government", "non-government", "organization", "organisation", "quasi autonomous", "quasi-autonomous"], "name": "Quasi-NGO Office"},
     "office/religion": {"icon": "maki-suitcase", "fields": ["{office}", "religion", "denomination"], "geometry": ["point", "area"], "tags": {"office": "religion"}, "terms": [], "name": "Religious Office"},
     "office/research": {"icon": "fas-flask", "geometry": ["point", "area"], "tags": {"office": "research"}, "terms": ["R and D", "research and development", "research lab"], "name": "Research Office"},
     "office/surveyor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "surveyor"}, "terms": [], "name": "Surveyor Office"},
     "office/tax_advisor": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "tax_advisor"}, "terms": ["tax", "tax consultant"], "name": "Tax Advisor Office"},
     "office/telecommunication": {"icon": "maki-telephone", "geometry": ["point", "area"], "tags": {"office": "telecommunication"}, "terms": ["communication", "internet service provider", "isp", "network", "telephone", "voice"], "name": "Telecom Office"},
     "office/therapist": {"icon": "maki-suitcase", "geometry": ["point", "area"], "tags": {"office": "therapist"}, "terms": ["therapy"], "name": "Therapist Office"},
-    "office/water_utility": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["utility", "water board"], "name": "Water Utility Office"},
-    "piste/downhill": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["alpine", "downhill", "piste", "ski", "snowboard"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
-    "piste/downhill/halfpipe": {"icon": "fas-snowboarding", "geometry": ["line", "area"], "terms": ["alpine", "downhill", "half pipe", "halfpipe", "piste", "ski", "snowboard"], "tags": {"piste:type": "downhill", "man_made": "piste:halfpipe"}, "name": "Halfpipe"},
-    "piste/hike": {"icon": "temaki-snow_shoeing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "piste", "ski", "snowshoe", "snowshoeing", "winter hiking"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
-    "piste/ice_skate": {"icon": "fas-skating", "fields": ["name", "piste/type", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "piste", "skating", "ski"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
-    "piste/nordic": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["crosscountry", "nordic", "piste", "skating", "ski"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
-    "piste/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["alpine", "crosscountry", "downhill", "horse", "husky", "ice", "luge", "nordic", "skating", "ski", "ski touring", "ski-joring", "skitour", "sled", "sledge", "sleigh", "snowboard", "snowshoe", "snowshoeing", "winter hiking"], "tags": {"piste:type": "*"}, "name": "Winter Sport Trails"},
-    "piste/skitour": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["crosscountry", "piste", "ski", "ski touring", "skitour"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
-    "piste/sled": {"icon": "temaki-sledding", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["luge", "piste", "ski", "sled", "sledge", "sleigh"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
-    "piste/sleigh": {"icon": "fas-sleigh", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["horse", "husky", "luge", "piste", "ski", "ski-joring", "sled", "sledge", "sleigh"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
+    "office/water_utility": {"icon": "maki-suitcase", "fields": ["{office}", "operator"], "geometry": ["point", "area"], "tags": {"office": "water_utility"}, "terms": ["water board", "utility"], "name": "Water Utility Office"},
+    "piste/downhill": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty_downhill", "piste/grooming_downhill", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "alpine", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill"}, "name": "Downhill Piste/Ski Run"},
+    "piste/downhill/halfpipe": {"icon": "fas-snowboarding", "geometry": ["line", "area"], "terms": ["ski", "alpine", "halfpipe", "half pipe", "snowboard", "downhill", "piste"], "tags": {"piste:type": "downhill", "man_made": "piste:halfpipe"}, "name": "Halfpipe"},
+    "piste/hike": {"icon": "temaki-snow_shoeing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming_hike", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["hike", "winter hiking", "snowshoe", "snowshoeing", "piste", "ski"], "tags": {"piste:type": "hike"}, "name": "Snowshoeing or Winter Hiking Trail"},
+    "piste/ice_skate": {"icon": "fas-skating", "fields": ["name", "piste/type", "sport_ice", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ice", "skating", "ski", "piste"], "tags": {"piste:type": "ice_skate"}, "name": "Ice Skating Piste"},
+    "piste/nordic": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_nordic", "piste/grooming_nordic", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "skating", "piste"], "tags": {"piste:type": "nordic"}, "name": "Nordic or Crosscountry Piste/Ski Trail"},
+    "piste/piste": {"icon": "fas-skiing", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "nordic", "crosscountry", "downhill", "alpine", "snowboard", "skitour", "ski touring", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse", "winter hiking", "snowshoe", "snowshoeing", "ice", "skating"], "tags": {"piste:type": "*"}, "name": "Winter Sport Trails"},
+    "piste/skitour": {"icon": "fas-skiing-nordic", "fields": ["name", "piste/type", "piste/difficulty_skitour", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "skitour", "crosscountry", "ski touring", "piste"], "tags": {"piste:type": "skitour"}, "name": "Ski Touring Trail"},
+    "piste/sled": {"icon": "temaki-sledding", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "sled", "luge", "sleigh", "sledge", "piste"], "tags": {"piste:type": "sled"}, "name": "Sled Piste"},
+    "piste/sleigh": {"icon": "fas-sleigh", "fields": ["name", "piste/type", "piste/difficulty", "piste/grooming", "oneway", "lit"], "geometry": ["line", "area"], "terms": ["ski", "piste", "sled", "luge", "sleigh", "sledge", "ski-joring", "husky", "horse"], "tags": {"piste:type": "sleigh"}, "name": "Sleigh Piste"},
     "place/farm": {"icon": "maki-farm", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "farm"}, "name": "Farm", "searchable": false},
     "place/city_block": {"icon": "maki-triangle-stroked", "fields": ["name"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "city_block"}, "name": "City Block"},
     "place/city": {"icon": "maki-city", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "city"}, "name": "City"},
@@ -874,7 +874,7 @@
     "place/isolated_dwelling": {"icon": "maki-home", "geometry": ["point", "area"], "fields": ["name"], "tags": {"place": "isolated_dwelling"}, "name": "Isolated Dwelling"},
     "place/locality": {"icon": "maki-triangle-stroked", "geometry": ["point", "area"], "moreFields": ["website"], "fields": ["name"], "tags": {"place": "locality"}, "name": "Locality"},
     "place/neighbourhood": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "neighbourhood"}, "terms": ["neighbourhood"], "name": "Neighborhood"},
-    "place/plot": {"icon": "maki-triangle-stroked", "fields": ["name"], "geometry": ["point", "area"], "tags": {"place": "plot"}, "terms": ["land", "lot", "parcel", "tract"], "name": "Plot"},
+    "place/plot": {"icon": "maki-triangle-stroked", "fields": ["name"], "geometry": ["point", "area"], "tags": {"place": "plot"}, "terms": ["tract", "land", "lot", "parcel"], "name": "Plot"},
     "place/quarter": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "quarter"}, "terms": ["boro", "borough", "quarter"], "name": "Sub-Borough / Quarter"},
     "place/square": {"icon": "temaki-pedestrian", "geometry": ["point", "area"], "fields": ["name"], "moreFields": ["website"], "tags": {"place": "square"}, "name": "Square"},
     "place/suburb": {"icon": "maki-triangle-stroked", "fields": ["name", "population"], "moreFields": ["website"], "geometry": ["point", "area"], "tags": {"place": "suburb"}, "terms": ["boro", "borough", "quarter"], "name": "Borough / Suburb"},
@@ -900,10 +900,10 @@
     "power/cable/underground": {"fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "cable", "location": "underground"}, "addTags": {"power": "cable", "location": "underground", "layer": "-1"}, "name": "Underground Power Cable"},
     "power/generator": {"icon": "temaki-power", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["level", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["hydro", "solar", "turbine", "wind"], "tags": {"power": "generator"}, "name": "Power Generator"},
     "power/generator/method/photovoltaic": {"icon": "fas-solar-panel", "fields": ["operator", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["photovoltaic module", "PV module", "sunlight"], "tags": {"power": "generator", "generator:method": "photovoltaic"}, "addTags": {"power": "generator", "generator:source": "solar", "generator:method": "photovoltaic", "generator:type": "solar_photovoltaic_panel", "generator:output:electricity": "yes"}, "reference": {"key": "generator:method", "value": "photovoltaic"}, "name": "Solar Panel"},
-    "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["operator", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["height", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["dam", "francis turbine", "generator", "hydroelectricity", "kaplan turbine", "pelton turbine"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "name": "Water Turbine"},
+    "power/generator/source/hydro": {"icon": "temaki-power", "fields": ["operator", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["height", "manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["dam", "generator", "francis turbine", "hydroelectricity", "kaplan turbine", "pelton turbine"], "tags": {"power": "generator", "generator:source": "hydro"}, "addTags": {"power": "generator", "generator:source": "hydro", "generator:output:electricity": "yes"}, "reference": {"key": "generator:source", "value": "hydro"}, "name": "Water Turbine"},
     "power/generator/source/nuclear": {"icon": "temaki-radiation", "fields": ["operator", "generator/source", "generator/method", "generator/type", "generator/output/electricity", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["fission", "generator", "nuclear", "nuke", "reactor"], "tags": {"power": "generator", "generator:source": "nuclear", "generator:method": "fission"}, "reference": {"key": "generator:source", "value": "nuclear"}, "name": "Nuclear Reactor"},
-    "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "wind", "windmill"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
-    "power/line": {"icon": "temaki-power_tower", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high tension line", "high voltage line"], "tags": {"power": "line"}, "name": "Power Line"},
+    "power/generator/source/wind": {"icon": "temaki-wind_turbine", "fields": ["operator", "generator/type", "generator/output/electricity", "height", "ref"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex", "area"], "terms": ["generator", "turbine", "windmill", "wind"], "tags": {"power": "generator", "generator:source": "wind", "generator:method": "wind_turbine"}, "reference": {"key": "generator:source", "value": "wind"}, "name": "Wind Turbine"},
+    "power/line": {"icon": "temaki-power_tower", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "terms": ["electric power transmission line", "high voltage line", "high tension line"], "tags": {"power": "line"}, "name": "Power Line"},
     "power/minor_line": {"icon": "iD-power-line", "fields": ["name", "operator", "voltage", "ref", "layer"], "geometry": ["line"], "tags": {"power": "minor_line"}, "name": "Minor Power Line"},
     "power/plant": {"icon": "maki-industry", "fields": ["name", "operator", "address", "plant/output/electricity", "start_date"], "geometry": ["area"], "tags": {"power": "plant"}, "addTags": {"power": "plant", "landuse": "industrial"}, "terms": ["coal", "gas", "generat*", "hydro", "nuclear", "power", "station"], "name": "Power Station Grounds"},
     "power/pole": {"icon": "temaki-utility_pole", "fields": ["ref", "operator", "height", "material", "line_attachment"], "moreFields": ["manufacturer"], "geometry": ["point", "vertex"], "tags": {"power": "pole"}, "name": "Power Pole"},
@@ -915,7 +915,7 @@
     "public_transport/platform": {"icon": "temaki-pedestrian", "fields": ["ref_platform", "network", "operator", "departures_board", "surface"], "moreFields": ["access", "covered", "indoor", "layer", "level", "lit", "wheelchair"], "geometry": ["line", "area"], "tags": {"public_transport": "platform"}, "terms": ["platform", "public transit", "public transportation", "transit", "transportation"], "name": "Transit Platform", "matchScore": 0.6},
     "public_transport/platform/aerialway_point": {"icon": "maki-aerialway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Aerialway Stop / Platform"},
     "public_transport/platform/ferry_point": {"icon": "maki-ferry", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "searchable": false, "name": "Ferry Stop / Platform"},
-    "public_transport/platform/light_rail_point": {"icon": "temaki-light_rail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "transit", "transportation", "trolley"], "searchable": false, "name": "Light Rail Stop / Platform"},
+    "public_transport/platform/light_rail_point": {"icon": "temaki-light_rail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "searchable": false, "name": "Light Rail Stop / Platform"},
     "public_transport/platform/monorail_point": {"icon": "temaki-monorail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "monorail": "yes"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "searchable": false, "name": "Monorail Stop / Platform"},
     "public_transport/platform/subway_point": {"icon": "temaki-subway", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "subway": "yes"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "searchable": false, "name": "Subway Stop / Platform"},
     "public_transport/platform/train_point": {"icon": "maki-rail", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "train": "yes"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "searchable": false, "name": "Train Stop / Platform"},
@@ -923,78 +923,78 @@
     "public_transport/platform/bus_point": {"icon": "maki-bus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stop"},
     "public_transport/platform/bus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "bus": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Platform"},
     "public_transport/platform/ferry": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["boat", "dock", "ferry", "pier", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Platform"},
-    "public_transport/platform/light_rail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "transit", "transportation", "trolley"], "name": "Light Rail Platform"},
+    "public_transport/platform/light_rail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "light_rail": "yes"}, "addTags": {"public_transport": "platform", "light_rail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Platform"},
     "public_transport/platform/monorail": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "monorail": "yes"}, "addTags": {"public_transport": "platform", "monorail": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["monorail", "platform", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Platform"},
     "public_transport/platform/subway": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "subway": "yes"}, "addTags": {"public_transport": "platform", "subway": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["metro", "platform", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Platform"},
     "public_transport/platform/train": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "train": "yes"}, "addTags": {"public_transport": "platform", "train": "yes", "railway": "platform"}, "reference": {"key": "railway", "value": "platform"}, "terms": ["platform", "public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Platform"},
-    "public_transport/platform/tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "tram": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "transit", "transportation", "trolley"], "name": "Tram Stop / Platform"},
-    "public_transport/platform/tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "transit", "transportation", "trolley"], "name": "Tram Platform"},
-    "public_transport/platform/trolleybus_point": {"icon": "temaki-trolleybus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "transit", "transportation", "trolley"], "name": "Trolleybus Stop"},
-    "public_transport/platform/trolleybus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "transit", "transportation", "trolley"], "name": "Trolleybus Platform"},
+    "public_transport/platform/tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "tram": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stop / Platform"},
+    "public_transport/platform/tram": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "tram": "yes"}, "addTags": {"public_transport": "platform", "tram": "yes", "railway": "platform"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["electric", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Platform"},
+    "public_transport/platform/trolleybus_point": {"icon": "temaki-trolleybus", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "addTags": {"public_transport": "platform", "trolleybus": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stop"},
+    "public_transport/platform/trolleybus": {"icon": "temaki-pedestrian", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "electric", "platform", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Platform"},
     "public_transport/station_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/station}", "aerialway/access", "aerialway/summer/access"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "vertex", "area"], "tags": {"public_transport": "station", "aerialway": "yes"}, "reference": {"key": "aerialway", "value": "station"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Aerialway Station"},
     "public_transport/station_bus": {"icon": "maki-bus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "bus": "yes"}, "addTags": {"public_transport": "station", "bus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Bus Station / Terminal"},
     "public_transport/station_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "ferry": "yes"}, "addTags": {"public_transport": "station", "ferry": "yes", "amenity": "ferry_terminal"}, "reference": {"key": "amenity", "value": "ferry_terminal"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Ferry Station / Terminal"},
-    "public_transport/station_light_rail": {"icon": "temaki-light_rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "light_rail": "yes"}, "addTags": {"public_transport": "station", "light_rail": "yes", "railway": "station", "station": "light_rail"}, "reference": {"key": "station", "value": "light_rail"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "terminal", "track", "tram", "transit", "transportation", "trolley"], "name": "Light Rail Station"},
+    "public_transport/station_light_rail": {"icon": "temaki-light_rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "light_rail": "yes"}, "addTags": {"public_transport": "station", "light_rail": "yes", "railway": "station", "station": "light_rail"}, "reference": {"key": "station", "value": "light_rail"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Station"},
     "public_transport/station_monorail": {"icon": "temaki-monorail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "monorail": "yes"}, "addTags": {"public_transport": "station", "monorail": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["monorail", "public transit", "public transportation", "rail", "station", "terminal", "transit", "transportation"], "name": "Monorail Station"},
     "public_transport/station_subway": {"icon": "temaki-subway", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "subway": "yes"}, "addTags": {"public_transport": "station", "subway": "yes", "railway": "station", "station": "subway"}, "reference": {"key": "station", "value": "subway"}, "terms": ["metro", "public transit", "public transportation", "rail", "station", "subway", "terminal", "track", "transit", "transportation", "underground"], "name": "Subway Station"},
     "public_transport/station_train_halt": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "train": "yes", "railway": "halt"}, "reference": {"key": "railway", "value": "halt"}, "terms": ["halt", "public transit", "public transportation", "rail", "station", "track", "train", "transit", "transportation", "whistle stop"], "name": "Train Station (Halt / Request)"},
     "public_transport/station_train": {"icon": "maki-rail", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["vertex", "point", "area"], "tags": {"public_transport": "station", "train": "yes"}, "addTags": {"public_transport": "station", "train": "yes", "railway": "station"}, "reference": {"key": "railway", "value": "station"}, "terms": ["public transit", "public transportation", "rail", "station", "terminal", "track", "train", "transit", "transportation"], "name": "Train Station"},
-    "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "transit", "transportation", "trolley"], "name": "Tram Station"},
-    "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "transit", "transportation", "trolley"], "name": "Trolleybus Station / Terminal"},
-    "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "email", "fax", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
+    "public_transport/station_tram": {"icon": "temaki-tram", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "tram": "yes"}, "reference": {"key": "public_transport", "value": "station"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "station", "streetcar", "terminal", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Station"},
+    "public_transport/station_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/station}"], "moreFields": ["{public_transport/station}"], "geometry": ["point", "area"], "tags": {"public_transport": "station", "trolleybus": "yes"}, "addTags": {"public_transport": "station", "trolleybus": "yes", "amenity": "bus_station"}, "reference": {"key": "amenity", "value": "bus_station"}, "terms": ["bus", "electric", "public transit", "public transportation", "station", "streetcar", "terminal", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Station / Terminal"},
+    "public_transport/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "internet_access/fee", "internet_access/ssid", "level", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"public_transport": "station"}, "terms": ["public transit", "public transportation", "station", "terminal", "transit", "transportation"], "name": "Transit Station", "matchScore": 0.2},
     "public_transport/stop_area": {"icon": "iD-relation", "fields": ["name", "ref", "network", "operator"], "geometry": ["relation"], "tags": {"type": "public_transport", "public_transport": "stop_area"}, "reference": {"key": "public_transport", "value": "stop_area"}, "name": "Transit Stop Area"},
     "public_transport/stop_position_aerialway": {"icon": "maki-aerialway", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["aerialway", "cable car", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Stopping Location"},
     "public_transport/stop_position_bus": {"icon": "maki-bus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "bus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "public transit", "public transportation", "transit", "transportation"], "name": "Bus Stopping Location"},
     "public_transport/stop_position_ferry": {"icon": "maki-ferry", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "ferry": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["boat", "dock", "ferry", "pier", "public transit", "public transportation", "transit", "transportation"], "name": "Ferry Stopping Location"},
-    "public_transport/stop_position_light_rail": {"icon": "temaki-light_rail", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "light_rail": "yes"}, "addTags": {"public_transport": "stop_position", "light_rail": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "track", "tram", "transit", "transportation", "trolley"], "name": "Light Rail Stopping Location"},
+    "public_transport/stop_position_light_rail": {"icon": "temaki-light_rail", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "light_rail": "yes"}, "addTags": {"public_transport": "stop_position", "light_rail": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "track", "tram", "trolley", "transit", "transportation"], "name": "Light Rail Stopping Location"},
     "public_transport/stop_position_monorail": {"icon": "temaki-monorail", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "monorail": "yes"}, "addTags": {"public_transport": "stop_position", "monorail": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["monorail", "public transit", "public transportation", "rail", "transit", "transportation"], "name": "Monorail Stopping Location"},
     "public_transport/stop_position_subway": {"icon": "temaki-subway", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "subway": "yes"}, "addTags": {"public_transport": "stop_position", "subway": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["metro", "public transit", "public transportation", "rail", "subway", "track", "transit", "transportation", "underground"], "name": "Subway Stopping Location"},
     "public_transport/stop_position_train": {"icon": "maki-rail", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "train": "yes"}, "addTags": {"public_transport": "stop_position", "train": "yes", "railway": "stop"}, "reference": {"key": "railway", "value": "stop"}, "terms": ["public transit", "public transportation", "rail", "track", "train", "transit", "transportation"], "name": "Train Stopping Location"},
-    "public_transport/stop_position_tram": {"icon": "temaki-tram", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "tram": "yes"}, "addTags": {"public_transport": "stop_position", "tram": "yes", "railway": "tram_stop"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "transit", "transportation", "trolley"], "name": "Tram Stopping Location"},
-    "public_transport/stop_position_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "electric", "public transit", "public transportation", "streetcar", "trackless", "tram", "transit", "transportation", "trolley"], "name": "Trolleybus Stopping Location"},
+    "public_transport/stop_position_tram": {"icon": "temaki-tram", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "tram": "yes"}, "addTags": {"public_transport": "stop_position", "tram": "yes", "railway": "tram_stop"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["electric", "light rail", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "trolley", "transit", "transportation"], "name": "Tram Stopping Location"},
+    "public_transport/stop_position_trolleybus": {"icon": "temaki-trolleybus", "fields": ["{public_transport/stop_position}"], "moreFields": ["{public_transport/stop_position}"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position", "trolleybus": "yes"}, "reference": {"key": "public_transport", "value": "stop_position"}, "terms": ["bus", "electric", "public transit", "public transportation", "streetcar", "trackless", "tram", "trolley", "transit", "transportation"], "name": "Trolleybus Stopping Location"},
     "public_transport/stop_position": {"icon": "maki-bus", "fields": ["name", "ref_stop_position", "network", "operator"], "moreFields": ["level"], "geometry": ["vertex"], "tags": {"public_transport": "stop_position"}, "terms": ["public transit", "public transportation", "transit", "transportation"], "name": "Transit Stopping Location", "matchScore": 0.2},
-    "railway/halt": {"icon": "maki-rail", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "terms": ["break", "interrupt", "interruption", "rest", "wait"], "name": "Train Station (Halt / Request)", "searchable": false},
+    "railway/halt": {"icon": "maki-rail", "geometry": ["point", "vertex"], "tags": {"railway": "halt"}, "terms": ["break", "interrupt", "rest", "wait", "interruption"], "name": "Train Station (Halt / Request)", "searchable": false},
     "railway/platform": {"icon": "temaki-pedestrian", "fields": ["name", "ref_platform", "surface", "lit", "shelter"], "geometry": ["line", "area"], "tags": {"railway": "platform"}, "name": "Train Platform", "searchable": false, "replacement": "public_transport/platform/train"},
-    "railway/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "terms": ["station", "train station"], "matchScore": 0.95, "name": "Train Station", "searchable": false, "replacement": "public_transport/station_train"},
+    "railway/station": {"icon": "maki-rail", "fields": ["name", "network", "operator", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "vertex", "area"], "tags": {"railway": "station"}, "terms": ["train station", "station"], "matchScore": 0.95, "name": "Train Station", "searchable": false, "replacement": "public_transport/station_train"},
     "railway/tram_stop": {"icon": "temaki-tram", "fields": ["name", "network", "operator"], "geometry": ["vertex"], "tags": {"railway": "tram_stop"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram Stopping Position", "searchable": false},
     "railway/abandoned": {"icon": "iD-railway-abandoned", "fields": ["name", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "abandoned"}, "terms": [], "matchScore": 0.85, "name": "Abandoned Railway"},
-    "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["buffer", "halt", "stop"], "name": "Buffer Stop"},
+    "railway/buffer_stop": {"icon": "temaki-buffer_stop", "geometry": ["vertex"], "tags": {"railway": "buffer_stop"}, "terms": ["stop", "halt", "buffer"], "name": "Buffer Stop"},
     "railway/construction": {"icon": "iD-railway-rail", "fields": ["name", "opening_date", "check_date", "note", "structure", "gauge", "electrified"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "service_rail", "usage_rail", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "construction"}, "name": "Railway Under Construction"},
-    "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "path through railroad", "pedestrian crossing", "railroad crossing", "train crossing"], "name": "Railway Crossing (Path)"},
+    "railway/crossing": {"icon": "temaki-pedestrian", "geometry": ["vertex"], "tags": {"railway": "crossing"}, "terms": ["crossing", "pedestrian crossing", "railroad crossing", "level crossing", "grade crossing", "path through railroad", "train crossing"], "name": "Railway Crossing (Path)"},
     "railway/derail": {"icon": "maki-roadblock", "geometry": ["vertex"], "tags": {"railway": "derail"}, "terms": ["derailer"], "name": "Railway Derailer"},
     "railway/disused": {"icon": "iD-railway-disused", "fields": ["operator", "structure", "service_rail", "usage_rail"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"railway": "disused"}, "terms": [], "name": "Disused Railway"},
-    "railway/funicular": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "service_rail"], "moreFields": ["covered"], "geometry": ["line"], "terms": ["cable car", "cable railway", "cliff railway", "funicular railway", "venicular"], "tags": {"railway": "funicular"}, "name": "Funicular"},
-    "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "grade crossing", "level crossing", "railroad crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
+    "railway/funicular": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "service_rail"], "moreFields": ["covered"], "geometry": ["line"], "terms": ["venicular", "cliff railway", "cable car", "cable railway", "funicular railway"], "tags": {"railway": "funicular"}, "name": "Funicular"},
+    "railway/level_crossing": {"icon": "maki-cross", "geometry": ["vertex"], "tags": {"railway": "level_crossing"}, "terms": ["crossing", "railroad crossing", "level crossing", "grade crossing", "road through railroad", "train crossing"], "name": "Railway Crossing (Road)"},
     "railway/light_rail": {"icon": "temaki-light_rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "light_rail"}, "terms": ["light rail", "streetcar", "trolley"], "name": "Light Rail"},
-    "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["marker", "milestone"], "name": "Railway Milestone"},
-    "railway/miniature": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["minimum gauge railway", "narrow gauge railway", "rideable miniature railway"], "name": "Miniature Railway"},
+    "railway/milestone": {"icon": "temaki-milestone", "geometry": ["point", "vertex"], "fields": ["railway/position", "direction_vertex"], "tags": {"railway": "milestone"}, "terms": ["milestone", "marker"], "name": "Railway Milestone"},
+    "railway/miniature": {"icon": "iD-railway-rail", "fields": ["name", "structure", "gauge", "electrified", "service_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "miniature"}, "terms": ["rideable miniature railway", "narrow gauge railway", "minimum gauge railway"], "name": "Miniature Railway"},
     "railway/monorail": {"icon": "temaki-monorail", "fields": ["name", "operator", "structure", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "monorail"}, "terms": [], "name": "Monorail"},
-    "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railroad", "narrow gauge railway"], "name": "Narrow Gauge Rail"},
+    "railway/narrow_gauge": {"icon": "iD-railway-rail", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "narrow_gauge"}, "terms": ["narrow gauge railway", "narrow gauge railroad"], "name": "Narrow Gauge Rail"},
     "railway/rail": {"icon": "iD-railway-rail", "fields": ["name", "operator", "structure", "gauge", "electrified", "service_rail", "usage_rail"], "moreFields": ["covered", "frequency_electrified", "highspeed", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "rail"}, "terms": ["rail line", "railroad track", "train track"], "name": "Rail"},
     "railway/rail/highspeed": {"icon": "iD-railway-rail", "geometry": ["line"], "tags": {"railway": "rail", "highspeed": "yes"}, "reference": {"key": "highspeed"}, "terms": ["bullet train", "fast rail", "high speed rail", "highspeed rail", "HSR"], "name": "High-Speed Rail"},
-    "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["lights", "signal"], "name": "Railway Signal"},
+    "railway/signal": {"icon": "temaki-railway_signals", "geometry": ["point", "vertex"], "fields": ["railway/position", "railway/signal/direction", "ref"], "tags": {"railway": "signal"}, "terms": ["signal", "lights"], "name": "Railway Signal"},
     "railway/subway_entrance": {"icon": "maki-entrance", "geometry": ["point", "vertex"], "fields": ["name", "level"], "tags": {"railway": "subway_entrance"}, "terms": ["metro", "transit"], "name": "Subway Entrance"},
     "railway/subway": {"icon": "temaki-subway", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "subway"}, "terms": ["metro", "transit"], "name": "Subway"},
-    "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["points", "switch"], "name": "Railway Switch"},
-    "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["clean", "wash"], "name": "Train Wash"},
+    "railway/switch": {"icon": "temaki-junction", "geometry": ["vertex"], "tags": {"railway": "switch"}, "terms": ["switch", "points"], "name": "Railway Switch"},
+    "railway/train_wash": {"icon": "maki-rail", "geometry": ["point", "vertex", "area"], "fields": ["operator", "building_area"], "tags": {"railway": "wash"}, "terms": ["wash", "clean"], "name": "Train Wash"},
     "railway/tram": {"icon": "temaki-tram", "fields": ["{railway/rail}"], "moreFields": ["covered", "frequency_electrified", "maxspeed", "voltage_electrified"], "geometry": ["line"], "tags": {"railway": "tram"}, "terms": ["light rail", "streetcar", "tram", "trolley"], "name": "Tram"},
     "relation": {"icon": "iD-relation", "fields": ["name", "relation"], "geometry": ["relation"], "tags": {}, "name": "Relation"},
     "route/ferry": {"icon": "maki-ferry", "geometry": ["line"], "fields": ["name", "operator", "duration", "access", "toll", "to", "from"], "moreFields": ["charge_toll", "dog", "interval", "maxheight", "maxweight", "network", "opening_hours", "ref_route", "wheelchair"], "tags": {"route": "ferry"}, "terms": ["boat", "merchant vessel", "ship", "water bus", "water shuttle", "water taxi"], "name": "Ferry Route"},
-    "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "iala", "isolated danger beacon"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
-    "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon lateral", "cevni", "channel marker", "iala", "lateral beacon", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
-    "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["buoy lateral", "cevni", "channel marker", "iala", "lateral buoy", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
-    "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["buoy lateral", "cevni", "channel marker", "iala", "lateral buoy", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
-    "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["buoy lateral", "cevni", "channel marker", "iala", "lateral buoy", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
-    "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["bollard", "buoy", "dolphin", "pile", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
+    "seamark/beacon_isolated_danger": {"fields": ["ref", "operator", "seamark/beacon_isolated_danger/shape", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["beacon isolated danger", "isolated danger beacon", "iala"], "tags": {"seamark:type": "beacon_isolated_danger"}, "name": "Danger Beacon"},
+    "seamark/beacon_lateral": {"fields": ["ref", "operator", "seamark/beacon_lateral/colour", "seamark/beacon_lateral/category", "seamark/beacon_lateral/shape", "seamark/beacon_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral beacon", "beacon lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "beacon_lateral"}, "name": "Channel Beacon"},
+    "seamark/buoy_lateral": {"fields": ["ref", "operator", "seamark/buoy_lateral/colour", "seamark/buoy_lateral/category", "seamark/buoy_lateral/shape", "seamark/buoy_lateral/system", "seamark/type"], "geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral"}, "name": "Channel Buoy"},
+    "seamark/buoy_lateral/green": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "green"}, "name": "Green Buoy"},
+    "seamark/buoy_lateral/red": {"geometry": ["point", "vertex"], "terms": ["lateral buoy", "buoy lateral", "cevni", "channel marker", "iala", "lateral mark"], "tags": {"seamark:type": "buoy_lateral", "seamark:buoy_lateral:colour": "red"}, "name": "Red Buoy"},
+    "seamark/mooring": {"fields": ["ref", "operator", "seamark/mooring/category", "seamark/type"], "geometry": ["point"], "terms": ["dolphin", "pile", "bollard", "buoy", "post"], "tags": {"seamark:type": "mooring"}, "name": "Mooring"},
     "shop": {"icon": "maki-shop", "fields": ["name", "shop", "operator", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["air_conditioning", "brand", "building/levels_building", "currency_multi", "email", "fax", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "phone", "second_hand", "stroller", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"shop": "*"}, "terms": [], "name": "Shop"},
     "shop/boutique": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "boutique"}, "searchable": false, "name": "Boutique"},
     "shop/fashion": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion"}, "searchable": false, "name": "Fashion Store"},
     "shop/fishmonger": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishmonger"}, "reference": {"key": "shop", "value": "seafood"}, "name": "Fishmonger", "searchable": false},
     "shop/furnace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["oven", "stove"], "tags": {"shop": "furnace"}, "name": "Furnace Store", "searchable": false},
     "shop/vacant": {"icon": "maki-shop", "fields": ["name", "address", "building_area"], "geometry": ["point", "area"], "tags": {"shop": "vacant"}, "name": "Vacant Shop", "searchable": false},
-    "shop/agrarian": {"icon": "fas-tractor", "fields": ["{shop}", "agrarian"], "geometry": ["point", "area"], "terms": ["agricultural inputs", "agricultural machines", "agricultural tools", "fertilizer", "pesticides", "seeds"], "tags": {"shop": "agrarian"}, "name": "Farm Supply Shop"},
+    "shop/agrarian": {"icon": "fas-tractor", "fields": ["{shop}", "agrarian"], "geometry": ["point", "area"], "terms": ["agricultural inputs", "agricultural machines", "seeds", "pesticides", "fertilizer", "agricultural tools"], "tags": {"shop": "agrarian"}, "name": "Farm Supply Shop"},
     "shop/alcohol": {"icon": "fas-wine-bottle", "fields": ["{shop}", "drive_through"], "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["alcohol", "beer", "booze", "wine"], "tags": {"shop": "alcohol"}, "name": "Liquor Store"},
-    "shop/anime": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "anime"}, "terms": ["cosplay", "dakimakura", "figurine", "japan", "manga"], "name": "Anime Shop"},
+    "shop/anime": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "anime"}, "terms": ["manga", "japan", "cosplay", "figurine", "dakimakura"], "name": "Anime Shop"},
     "shop/antiques": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "antiques"}, "name": "Antiques Shop"},
     "shop/appliance": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["air conditioner", "appliance", "dishwasher", "dryer", "freezer", "fridge", "grill", "kitchen", "oven", "refrigerator", "stove", "washer", "washing machine"], "tags": {"shop": "appliance"}, "name": "Appliance Store"},
     "shop/art": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery"], "tags": {"shop": "art"}, "name": "Art Store"},
@@ -1002,7 +1002,7 @@
     "shop/bag": {"icon": "fas-suitcase-rolling", "geometry": ["point", "area"], "terms": ["handbag", "purse"], "tags": {"shop": "bag"}, "name": "Bag/Luggage Store"},
     "shop/bakery": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "bakery"}, "terms": ["bread", "cakes", "rolls"], "name": "Bakery"},
     "shop/bathroom_furnishing": {"icon": "fas-bath", "geometry": ["point", "area"], "tags": {"shop": "bathroom_furnishing"}, "name": "Bathroom Furnishing Store"},
-    "shop/beauty": {"icon": "maki-shop", "fields": ["{shop}", "beauty"], "geometry": ["point", "area"], "terms": ["salon", "spa", "tanning"], "tags": {"shop": "beauty"}, "name": "Beauty Shop"},
+    "shop/beauty": {"icon": "maki-shop", "fields": ["{shop}", "beauty"], "geometry": ["point", "area"], "terms": ["spa", "salon", "tanning"], "tags": {"shop": "beauty"}, "name": "Beauty Shop"},
     "shop/beauty/nails": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["manicure", "pedicure"], "tags": {"shop": "beauty", "beauty": "nails"}, "reference": {"key": "shop", "value": "beauty"}, "name": "Nail Salon"},
     "shop/beauty/tanning": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "beauty", "beauty": "tanning"}, "reference": {"key": "leisure", "value": "tanning_salon"}, "name": "Tanning Salon"},
     "shop/bed": {"icon": "maki-lodging", "geometry": ["point", "area"], "tags": {"shop": "bed"}, "name": "Bedding/Mattress Store"},
@@ -1011,7 +1011,7 @@
     "shop/boat": {"icon": "temaki-boating", "geometry": ["point", "area"], "terms": ["fishing boat", "jetski", "motorboat", "rowboat", "sailboat", "vessel", "watercraft"], "tags": {"shop": "boat"}, "name": "Boat Store"},
     "shop/bookmaker": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["betting", "bookie"], "tags": {"shop": "bookmaker"}, "name": "Bookmaker"},
     "shop/books": {"icon": "fas-book", "fields": ["{shop}", "internet_access"], "moreFields": ["{shop}", "internet_access/fee", "internet_access/ssid"], "geometry": ["point", "area"], "tags": {"shop": "books"}, "name": "Book Store"},
-    "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["beef", "chicken", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"},
+    "shop/butcher": {"icon": "fas-bacon", "geometry": ["point", "area"], "terms": ["chicken", "beef", "lamb", "meat", "pork"], "tags": {"shop": "butcher"}, "name": "Butcher"},
     "shop/candles": {"icon": "fas-burn", "geometry": ["point", "area"], "tags": {"shop": "candles"}, "terms": ["wax"], "name": "Candle Shop"},
     "shop/cannabis": {"icon": "fas-cannabis", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["420", "marijuana", "pot", "reefer", "weed"], "tags": {"shop": "cannabis"}, "name": "Cannabis Shop"},
     "shop/car_parts": {"icon": "fas-car-battery", "geometry": ["point", "area"], "terms": ["automobile", "automotive"], "tags": {"shop": "car_parts"}, "name": "Car Parts Store"},
@@ -1020,40 +1020,40 @@
     "shop/caravan": {"icon": "temaki-rv_park", "fields": ["name", "brand", "{shop}", "second_hand", "service/vehicle"], "geometry": ["point", "area"], "tags": {"shop": "caravan"}, "terms": ["auto", "camper", "recreational vehicle"], "name": "RV Dealership"},
     "shop/carpet": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["rug"], "tags": {"shop": "carpet"}, "name": "Carpet Store"},
     "shop/catalogue": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "catalogue"}, "name": "Catalog Shop"},
-    "shop/charity": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["nonprofit", "op shop", "thrift"], "tags": {"shop": "charity"}, "name": "Charity Store"},
+    "shop/charity": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["thrift", "op shop", "nonprofit"], "tags": {"shop": "charity"}, "name": "Charity Store"},
     "shop/cheese": {"icon": "fas-cheese", "geometry": ["point", "area"], "tags": {"shop": "cheese"}, "name": "Cheese Store"},
     "shop/chemist": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "chemist"}, "terms": ["apothecary", "beauty", "drug store", "drugstore", "gift", "hair", "med*", "pharmacy", "prescription", "tooth"], "name": "Drugstore"},
     "shop/chocolate": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "chocolate"}, "terms": ["cocoa"], "name": "Chocolate Store"},
     "shop/clothes": {"icon": "maki-clothing-store", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "clothes"}, "terms": ["blouses", "boutique", "bras", "clothes", "dresses", "fashion", "pants", "shirts", "shorts", "skirts", "slacks", "socks", "suits", "underwear"], "name": "Clothing Store"},
-    "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "boxers", "bras", "brassieres", "briefs", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"},
+    "shop/clothes/underwear": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "tags": {"shop": "clothes", "clothes": "underwear"}, "reference": {"key": "clothes", "value": "underwear"}, "terms": ["boutique", "bras", "brassieres", "briefs", "boxers", "fashion", "lingerie", "panties", "slips", "socks", "stockings", "underclothes", "undergarments", "underpants", "undies"], "name": "Underwear Store"},
     "shop/coffee": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "coffee"}, "name": "Coffee Store"},
-    "shop/computer": {"icon": "fas-laptop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "terms": ["desktop", "hardware", "laptop", "operating system", "software"], "name": "Computer Store"},
+    "shop/computer": {"icon": "fas-laptop", "geometry": ["point", "area"], "tags": {"shop": "computer"}, "terms": ["desktop", "laptop", "hardware", "operating system", "software"], "name": "Computer Store"},
     "shop/confectionery": {"icon": "maki-confectionery", "geometry": ["point", "area"], "terms": ["sweet"], "tags": {"shop": "confectionery"}, "name": "Candy Store"},
     "shop/convenience": {"icon": "fas-shopping-basket", "geometry": ["point", "area"], "tags": {"shop": "convenience"}, "name": "Convenience Store"},
     "shop/copyshop": {"icon": "fas-print", "geometry": ["point", "area"], "tags": {"shop": "copyshop"}, "terms": ["print", "scan"], "name": "Copy Store"},
     "shop/cosmetics": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "cosmetics"}, "terms": ["make-up", "makeup"], "name": "Cosmetics Store"},
     "shop/country_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "country_store"}, "name": "Country Store"},
-    "shop/craft": {"icon": "fas-palette", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "frame", "paint*"], "name": "Arts and Crafts Store"},
+    "shop/craft": {"icon": "fas-palette", "geometry": ["point", "area"], "tags": {"shop": "craft"}, "terms": ["art*", "paint*", "frame"], "name": "Arts and Crafts Store"},
     "shop/curtain": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["drape*", "window"], "tags": {"shop": "curtain"}, "name": "Curtain Store"},
-    "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["cheese", "egg", "milk"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
+    "shop/dairy": {"icon": "fas-cheese", "geometry": ["point", "area"], "terms": ["milk", "egg", "cheese"], "tags": {"shop": "dairy"}, "name": "Dairy Store"},
     "shop/deli": {"icon": "maki-restaurant", "geometry": ["point", "area"], "terms": ["lunch", "meat", "sandwich"], "tags": {"shop": "deli"}, "name": "Deli"},
     "shop/department_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "department_store"}, "name": "Department Store"},
     "shop/doityourself": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "doityourself"}, "name": "DIY Store"},
     "shop/dry_cleaning": {"icon": "temaki-clothes_hanger", "geometry": ["point", "area"], "tags": {"shop": "dry_cleaning"}, "name": "Dry Cleaner"},
     "shop/e-cigarette": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "e-cigarette"}, "terms": ["electronic", "vape", "vaping", "vapor"], "name": "E-Cigarette Shop"},
     "shop/electronics": {"icon": "fas-plug", "geometry": ["point", "area"], "terms": ["appliance", "audio", "blueray", "camera", "computer", "dvd", "home theater", "radio", "speaker", "tv", "video"], "tags": {"shop": "electronics"}, "name": "Electronics Store"},
-    "shop/erotic": {"icon": "maki-shop", "fields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["porn", "sex"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
-    "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["porn", "sex"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"},
+    "shop/erotic": {"icon": "maki-shop", "fields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic"}, "name": "Erotic Store"},
+    "shop/erotic/lgbtq": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["sex", "porn"], "tags": {"shop": "erotic", "lgbtq": "primary"}, "name": "LGBTQ+ Erotic Store"},
     "shop/fabric": {"icon": "fas-tape", "geometry": ["point", "area"], "terms": ["sew"], "tags": {"shop": "fabric"}, "name": "Fabric Store"},
     "shop/farm": {"icon": "fas-apple-alt", "geometry": ["point", "area"], "terms": ["baked goods", "farm shop", "farm stand", "fresh food", "fruits", "greengrocer", "organics", "vegetables"], "tags": {"shop": "farm"}, "name": "Produce Stand"},
     "shop/fashion_accessories": {"icon": "maki-shop", "fields": ["name", "clothes", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "fashion_accessories"}, "terms": ["bag", "cologne", "fragrance", "hat", "jewellery", "purfume", "purse", "scarf", "sunglasses", "umbrella", "wallet", "watch"], "name": "Fashion Accessories Store"},
-    "shop/fireplace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fireplace", "masonry heater", "stove"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"},
+    "shop/fireplace": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fireplace", "stove", "masonry heater"], "tags": {"shop": "fireplace"}, "name": "Fireplace Store"},
     "shop/fishing": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "fishing"}, "terms": ["bait", "fishing line", "flies", "fly", "lure", "reel", "rod", "tackle"], "name": "Fishing Shop"},
     "shop/florist": {"icon": "maki-florist", "geometry": ["point", "area"], "terms": ["flower"], "tags": {"shop": "florist"}, "name": "Florist"},
-    "shop/frame": {"icon": "fas-vector-square", "geometry": ["point", "area"], "tags": {"shop": "frame"}, "terms": ["art*", "frame", "paint*", "photo*"], "name": "Framing Shop"},
+    "shop/frame": {"icon": "fas-vector-square", "geometry": ["point", "area"], "tags": {"shop": "frame"}, "terms": ["art*", "paint*", "photo*", "frame"], "name": "Framing Shop"},
     "shop/frozen_food": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "frozen_food"}, "name": "Frozen Food"},
     "shop/fuel": {"icon": "maki-shop", "fields": ["{shop}", "fuel_multi"], "geometry": ["point", "area"], "tags": {"shop": "fuel"}, "name": "Fuel Shop", "matchScore": 0.5},
-    "shop/funeral_directors": {"icon": "maki-cemetery", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["memorial home", "undertaker"], "tags": {"shop": "funeral_directors"}, "name": "Funeral Home"},
+    "shop/funeral_directors": {"icon": "maki-cemetery", "fields": ["{shop}", "religion", "denomination"], "geometry": ["point", "area"], "terms": ["undertaker", "memorial home"], "tags": {"shop": "funeral_directors"}, "name": "Funeral Home"},
     "shop/furniture": {"icon": "fas-couch", "geometry": ["point", "area"], "terms": ["chair", "sofa", "table"], "tags": {"shop": "furniture"}, "name": "Furniture Store"},
     "shop/games": {"icon": "fas-dice", "geometry": ["point", "area"], "tags": {"shop": "games"}, "terms": ["board game", "card game", "dice game", "game shop", "live action role-playing game", "miniatures wargame", "strategy game"], "name": "Tabletop Game Store"},
     "shop/garden_centre": {"icon": "maki-garden-centre", "geometry": ["point", "area"], "terms": ["landscape", "mulch", "shrub", "tree"], "tags": {"shop": "garden_centre"}, "name": "Garden Center"},
@@ -1061,22 +1061,22 @@
     "shop/general": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "general"}, "terms": ["Village Shop"], "name": "General Store"},
     "shop/gift": {"icon": "maki-gift", "geometry": ["point", "area"], "terms": ["souvenir"], "tags": {"shop": "gift"}, "name": "Gift Shop"},
     "shop/greengrocer": {"icon": "fas-carrot", "geometry": ["point", "area"], "terms": ["fruit", "produce", "vegetable"], "tags": {"shop": "greengrocer"}, "name": "Greengrocer"},
-    "shop/hairdresser_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["barber", "conditioner", "shampoo"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
+    "shop/hairdresser_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["barber", "shampoo", "conditioner"], "tags": {"shop": "hairdresser_supply"}, "name": "Hairdresser Supply Store"},
     "shop/hairdresser": {"icon": "temaki-beauty_salon", "geometry": ["point", "area"], "terms": ["barber"], "tags": {"shop": "hairdresser"}, "name": "Hairdresser"},
     "shop/hardware": {"icon": "temaki-tools", "geometry": ["point", "area"], "tags": {"shop": "hardware"}, "name": "Hardware Store"},
-    "shop/health_food": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["vegan", "vegetarian", "vitamins", "wholefood"], "tags": {"shop": "health_food"}, "name": "Health Food Shop"},
+    "shop/health_food": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["wholefood", "vitamins", "vegetarian", "vegan"], "tags": {"shop": "health_food"}, "name": "Health Food Shop"},
     "shop/hearing_aids": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hearing_aids"}, "name": "Hearing Aids Store"},
     "shop/herbalist": {"icon": "fas-leaf", "geometry": ["point", "area"], "tags": {"shop": "herbalist"}, "name": "Herbalist"},
     "shop/hifi": {"icon": "temaki-speaker", "geometry": ["point", "area"], "terms": ["audio", "hi-fi", "high fidelity", "stereo", "video"], "tags": {"shop": "hifi"}, "name": "Hifi Store"},
-    "shop/hobby": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "hobby"}, "terms": ["figurine", "manga", "model"], "name": "Hobby Shop"},
+    "shop/hobby": {"icon": "fas-dragon", "geometry": ["point", "area"], "tags": {"shop": "hobby"}, "terms": ["manga", "figurine", "model"], "name": "Hobby Shop"},
     "shop/houseware": {"icon": "fas-blender", "geometry": ["point", "area"], "terms": ["home", "household", "kitchenware"], "tags": {"shop": "houseware"}, "name": "Houseware Store"},
     "shop/hunting": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "hunting"}, "terms": ["arrows", "bows", "bullets", "crossbows", "rifles", "traps"], "name": "Hunting Shop"},
     "shop/interior_decoration": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "interior_decoration"}, "name": "Interior Decoration Store"},
-    "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jeweller", "jewellery", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"},
+    "shop/jewelry": {"icon": "maki-jewelry-store", "geometry": ["point", "area"], "terms": ["bracelet", "diamond", "earrings", "gem", "gold", "jeweler", "jewellery", "jeweller", "necklace", "pins", "ring", "silver"], "tags": {"shop": "jewelry"}, "name": "Jewelry Store"},
     "shop/kiosk": {"icon": "maki-shop", "fields": ["{shop}", "levels"], "geometry": ["point", "area"], "tags": {"shop": "kiosk"}, "name": "Kiosk"},
     "shop/kitchen": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "kitchen"}, "terms": ["cabinets", "countertops", "sinks"], "name": "Kitchen Design Store"},
     "shop/laundry": {"icon": "maki-laundry", "fields": ["{shop}", "self_service"], "geometry": ["point", "area"], "tags": {"shop": "laundry"}, "name": "Laundry"},
-    "shop/laundry/self_service": {"icon": "maki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Coin Wash", "Launderette", "Laundromat", "Washateria"], "name": "Self-Service Laundry"},
+    "shop/laundry/self_service": {"icon": "maki-laundry", "geometry": ["point", "area"], "tags": {"shop": "laundry", "self_service": "yes"}, "terms": ["Coin Laundry", "Laundromat", "Coin Wash", "Launderette", "Washateria"], "name": "Self-Service Laundry"},
     "shop/leather": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "leather"}, "name": "Leather Store"},
     "shop/lighting": {"icon": "far-lightbulb", "geometry": ["point", "area"], "terms": ["fluorescent lighting", "lamps", "LEDs", "light fixtures", "lightbulbs"], "tags": {"shop": "lighting"}, "name": "Lighting Store"},
     "shop/locksmith": {"icon": "fas-key", "geometry": ["point", "area"], "terms": ["key", "lockpick"], "tags": {"shop": "locksmith"}, "name": "Locksmith"},
@@ -1084,22 +1084,22 @@
     "shop/mall": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["shopping"], "tags": {"shop": "mall"}, "name": "Mall"},
     "shop/massage": {"icon": "temaki-spa", "geometry": ["point", "area"], "tags": {"shop": "massage"}, "name": "Massage Shop"},
     "shop/medical_supply": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "medical_supply"}, "name": "Medical Supply Store"},
-    "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army surplus", "army-navy store", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"},
+    "shop/military_surplus": {"icon": "temaki-military", "geometry": ["point", "area"], "terms": ["armor", "army-navy store", "army surplus", "navy surplus", "tactical gear", "war surplus shop", "weapons"], "tags": {"shop": "military_surplus"}, "name": "Military Surplus Store"},
     "shop/mobile_phone": {"icon": "fas-mobile-alt", "geometry": ["point", "area"], "tags": {"shop": "mobile_phone"}, "name": "Mobile Phone Store"},
     "shop/money_lender": {"icon": "maki-bank", "fields": ["{shop}", "currency_multi"], "geometry": ["point", "area"], "tags": {"shop": "money_lender"}, "name": "Money Lender"},
     "shop/motorcycle_repair": {"icon": "fas-motorcycle", "fields": ["{shop}", "service/vehicle"], "geometry": ["point", "area"], "terms": ["auto", "bike", "garage", "motorcycle", "repair", "service"], "tags": {"shop": "motorcycle_repair"}, "name": "Motorcycle Repair Shop"},
     "shop/motorcycle": {"icon": "fas-motorcycle", "fields": ["name", "brand", "{shop}"], "geometry": ["point", "area"], "terms": ["bike"], "tags": {"shop": "motorcycle"}, "name": "Motorcycle Dealership"},
-    "shop/music": {"icon": "fas-compact-disc", "geometry": ["point", "area"], "terms": ["CDs", "compact discs", "tape casettes", "vinyl records"], "tags": {"shop": "music"}, "name": "Music Store"},
+    "shop/music": {"icon": "fas-compact-disc", "geometry": ["point", "area"], "terms": ["tape casettes", "CDs", "compact discs", "vinyl records"], "tags": {"shop": "music"}, "name": "Music Store"},
     "shop/musical_instrument": {"icon": "fas-guitar", "geometry": ["point", "area"], "terms": ["guitar"], "tags": {"shop": "musical_instrument"}, "name": "Musical Instrument Store"},
     "shop/newsagent": {"icon": "fas-newspaper", "geometry": ["point", "area"], "tags": {"shop": "newsagent"}, "name": "Newspaper/Magazine Shop"},
     "shop/nutrition_supplements": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["health", "supplement", "vitamin"], "tags": {"shop": "nutrition_supplements"}, "name": "Nutrition Supplements Store"},
     "shop/optician": {"icon": "maki-optician", "geometry": ["point", "area"], "terms": ["eye", "glasses"], "tags": {"shop": "optician"}, "name": "Optician"},
     "shop/organic": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "supermarket", "organic": "only"}, "name": "Organic Goods Store"},
-    "shop/outdoor": {"icon": "temaki-compass", "fields": ["{shop}", "clothes"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outdoor equipment", "outdoor supplies", "outfitter"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
+    "shop/outdoor": {"icon": "temaki-compass", "fields": ["{shop}", "clothes"], "geometry": ["point", "area"], "terms": ["camping", "climbing", "hiking", "outfitter", "outdoor equipment", "outdoor supplies"], "tags": {"shop": "outdoor"}, "name": "Outdoors Store"},
     "shop/outpost": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["online", "pick up", "pickup"], "tags": {"shop": "outpost"}, "name": "Online Retailer Outpost"},
     "shop/paint": {"icon": "fas-paint-roller", "geometry": ["point", "area"], "tags": {"shop": "paint"}, "name": "Paint Store"},
     "shop/party": {"icon": "temaki-balloon", "geometry": ["point", "area"], "terms": ["balloons", "costumes", "decorations", "invitations"], "tags": {"shop": "party"}, "name": "Party Supply Store"},
-    "shop/pastry": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["cake shop", "cakery", "patisserie"], "name": "Pastry Shop"},
+    "shop/pastry": {"icon": "maki-bakery", "geometry": ["point", "area"], "tags": {"shop": "pastry"}, "terms": ["patisserie", "cake shop", "cakery"], "name": "Pastry Shop"},
     "shop/pawnbroker": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "pawnbroker"}, "name": "Pawn Shop"},
     "shop/perfumery": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "perfumery"}, "terms": ["cologne", "fragrance", "purfume"], "name": "Perfume Store"},
     "shop/pet_grooming": {"icon": "maki-dog-park", "geometry": ["point", "area"], "terms": ["cat", "dog"], "tags": {"shop": "pet_grooming"}, "name": "Pet Grooming Store"},
@@ -1112,13 +1112,13 @@
     "shop/rental": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "rental"}, "name": "Rental Shop"},
     "shop/scuba_diving": {"icon": "temaki-scuba_diving", "fields": ["{shop}", "scuba_diving"], "geometry": ["point", "area"], "terms": ["diving", "scuba"], "tags": {"shop": "scuba_diving"}, "name": "Scuba Diving Shop"},
     "shop/seafood": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["fishmonger"], "tags": {"shop": "seafood"}, "name": "Seafood Shop"},
-    "shop/second_hand": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["resale", "second hand", "secondhand", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
+    "shop/second_hand": {"icon": "maki-shop", "fields": ["{shop}", "second_hand"], "geometry": ["point", "area"], "terms": ["secondhand", "second hand", "resale", "thrift", "used"], "tags": {"shop": "second_hand"}, "name": "Consignment/Thrift Store"},
     "shop/sewing": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["haberdashery"], "tags": {"shop": "sewing"}, "name": "Sewing Supply Shop"},
     "shop/shoes": {"icon": "maki-shoe", "geometry": ["point", "area"], "tags": {"shop": "shoes"}, "terms": ["boots", "cleats", "clogs", "heels", "loafers", "oxfords", "sneakers"], "name": "Shoe Store"},
     "shop/sports": {"icon": "fas-futbol", "fields": ["name", "operator", "sport", "{shop}"], "geometry": ["point", "area"], "tags": {"shop": "sports"}, "terms": ["athletics"], "name": "Sporting Goods Store"},
     "shop/stationery": {"icon": "fas-paperclip", "geometry": ["point", "area"], "terms": ["card", "paper"], "tags": {"shop": "stationery"}, "name": "Stationery Store"},
     "shop/storage_rental": {"icon": "fas-warehouse", "geometry": ["point", "area"], "tags": {"shop": "storage_rental"}, "terms": ["garages"], "name": "Storage Rental"},
-    "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["{shop}", "diet_multi"], "geometry": ["point", "area"], "terms": ["grocery", "shop", "store"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
+    "shop/supermarket": {"icon": "maki-grocery", "moreFields": ["diet_multi", "{shop}"], "geometry": ["point", "area"], "terms": ["grocery", "store", "shop"], "tags": {"shop": "supermarket"}, "name": "Supermarket"},
     "shop/swimming_pool": {"icon": "fas-swimmer", "geometry": ["point", "area"], "terms": ["hot tub equipment store", "hot tub maintenance store", "hot tub supply store", "pool shop", "pool store", "swimming pool equipment store", "swimming pool installation store", "swimming pool maintenance store", "swimming pool supply shop"], "tags": {"shop": "swimming_pool"}, "name": "Pool Supply Store"},
     "shop/tailor": {"icon": "maki-clothing-store", "geometry": ["point", "area"], "terms": ["clothes", "suit"], "tags": {"shop": "tailor"}, "name": "Tailor"},
     "shop/tattoo": {"icon": "maki-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "tattoo"}, "terms": ["ink"], "name": "Tattoo Parlor"},
@@ -1138,63 +1138,63 @@
     "shop/water_sports": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
     "shop/water": {"icon": "tnp-2009234", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
     "shop/weapons": {"icon": "maki-shop", "geometry": ["point", "area"], "terms": ["ammo", "gun", "knife", "knives"], "tags": {"shop": "weapons"}, "name": "Weapon Shop"},
-    "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["cash and carry", "warehouse club"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
+    "shop/wholesale": {"icon": "maki-warehouse", "fields": ["{shop}", "wholesale"], "geometry": ["point", "area"], "terms": ["warehouse club", "cash and carry"], "tags": {"shop": "wholesale"}, "name": "Wholesale Store"},
     "shop/window_blind": {"icon": "temaki-window", "geometry": ["point", "area"], "tags": {"shop": "window_blind"}, "name": "Window Blind Store"},
     "shop/wine": {"icon": "maki-alcohol-shop", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "tags": {"shop": "wine"}, "name": "Wine Shop"},
-    "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "telecommunications", "the cloud"], "name": "Data Center"},
+    "telecom/data_center": {"icon": "fas-server", "fields": ["name", "ref", "operator", "building_area"], "moreFields": ["address", "phone", "website"], "geometry": ["point", "area"], "tags": {"telecom": "data_center"}, "terms": ["computer systems storage", "information technology", "server farm", "the cloud", "telecommunications"], "name": "Data Center"},
     "tourism/alpine_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["climbing hut"], "tags": {"tourism": "alpine_hut"}, "name": "Alpine Hut"},
-    "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "level", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
-    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
+    "tourism/apartment": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "level", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "apartment"}, "name": "Guest Apartment / Condo"},
+    "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["charge_fee", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "smoking", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["fish", "sea", "water"], "tags": {"tourism": "aquarium"}, "name": "Aquarium"},
     "tourism/artwork": {"icon": "maki-art-gallery", "fields": ["name", "artwork_type", "artist"], "moreFields": ["level", "material", "website"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork"}, "terms": ["mural", "sculpture", "statue"], "name": "Artwork"},
     "tourism/artwork/bust": {"icon": "fas-user-alt", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type"}, "terms": ["figure"], "name": "Bust"},
-    "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type"}, "terms": ["Graffiti Artwork", "Guerilla Artwork", "Street Artwork"], "name": "Graffiti"},
+    "tourism/artwork/graffiti": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "graffiti"}, "reference": {"key": "artwork_type"}, "terms": ["Street Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
     "tourism/artwork/installation": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type"}, "terms": ["interactive art", "intervention art", "modern art"], "name": "Art Installation"},
     "tourism/artwork/mural": {"icon": "maki-art-gallery", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "mural"}, "reference": {"key": "artwork_type", "value": "mural"}, "terms": ["fresco", "wall painting"], "name": "Mural"},
-    "tourism/artwork/sculpture": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["carving", "figure", "statue"], "name": "Sculpture"},
-    "tourism/artwork/statue": {"icon": "fas-female", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["carving", "figure", "sculpture"], "name": "Statue"},
+    "tourism/artwork/sculpture": {"icon": "maki-art-gallery", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "sculpture"}, "reference": {"key": "artwork_type", "value": "sculpture"}, "terms": ["statue", "figure", "carving"], "name": "Sculpture"},
+    "tourism/artwork/statue": {"icon": "fas-female", "fields": ["name", "artist", "material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "statue"}, "reference": {"key": "artwork_type", "value": "statue"}, "terms": ["sculpture", "figure", "carving"], "name": "Statue"},
     "tourism/attraction": {"icon": "maki-star", "fields": ["name", "operator", "address"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "attraction"}, "matchScore": 0.75, "name": "Tourist Attraction"},
-    "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["rv", "tent"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"},
-    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["rv", "tent"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
-    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access/ssid", "operator", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["Camper", "Motor Home"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
-    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
-    "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
-    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
+    "tourism/camp_pitch": {"icon": "maki-campsite", "fields": ["name", "ref"], "geometry": ["point", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_pitch"}, "name": "Camp Pitch"},
+    "tourism/camp_site": {"icon": "maki-campsite", "fields": ["name", "operator", "address", "access_simple", "capacity", "fee", "payment_multi_fee", "charge_fee", "internet_access", "internet_access/fee"], "moreFields": ["email", "fax", "internet_access/ssid", "phone", "power_supply", "reservation", "sanitary_dump_station", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["tent", "rv"], "tags": {"tourism": "camp_site"}, "name": "Campground"},
+    "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access", "internet_access/fee"], "moreFields": ["charge_fee", "operator", "fee", "payment_multi_fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"},
+    "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"},
+    "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"},
+    "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "smoking", "payment_multi", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"},
     "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"},
-    "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "bar", "stars"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
+    "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "stars", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"},
     "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "moreFields": ["level"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"},
     "tourism/information/board": {"icon": "maki-information", "fields": ["name", "operator", "board_type", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "board"}, "reference": {"key": "information", "value": "board"}, "name": "Information Board"},
     "tourism/information/guidepost": {"icon": "fas-map-signs", "fields": ["name", "elevation", "operator", "ref"], "moreFields": ["material"], "geometry": ["point", "vertex"], "terms": ["signpost"], "tags": {"tourism": "information", "information": "guidepost"}, "reference": {"key": "information", "value": "guidepost"}, "name": "Guidepost"},
     "tourism/information/map": {"icon": "fas-map", "fields": ["operator", "map_type", "map_size", "direction"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "map"}, "reference": {"key": "information", "value": "map"}, "name": "Map"},
-    "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
+    "tourism/information/office": {"icon": "maki-information", "fields": ["name", "operator", "address", "building_area", "internet_access", "internet_access/fee"], "moreFields": ["building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information", "information": "office"}, "reference": {"key": "information", "value": "office"}, "name": "Tourist Information Office"},
     "tourism/information/route_marker": {"icon": "maki-information", "fields": ["ref", "operator", "colour", "material", "elevation"], "geometry": ["point", "vertex"], "terms": ["cairn", "painted blaze", "route flag", "route marker", "stone pile", "trail blaze", "trail post", "way marker"], "tags": {"tourism": "information", "information": "route_marker"}, "reference": {"key": "information", "value": "route_marker"}, "name": "Trail Marker"},
     "tourism/information/terminal": {"icon": "maki-information", "fields": ["operator"], "geometry": ["point", "vertex"], "tags": {"tourism": "information", "information": "terminal"}, "reference": {"key": "information", "value": "terminal"}, "name": "Information Terminal"},
-    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "height_building", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
-    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "email", "fax", "fee", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "foundation", "gallery", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
-    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi_fee", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
-    "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
-    "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["address", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "opening_hours", "phone", "website"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
+    "tourism/motel": {"icon": "maki-lodging", "fields": ["name", "brand", "address", "building_area", "rooms", "internet_access", "internet_access/fee"], "moreFields": ["air_conditioning", "building/levels_building", "height_building", "email", "fax", "internet_access/ssid", "operator", "payment_multi", "phone", "reservation", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "motel"}, "name": "Motel"},
+    "tourism/museum": {"icon": "temaki-museum", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "charge_fee", "height_building", "fee", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "gallery", "foundation", "hall", "institution", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "museum"}, "name": "Museum"},
+    "tourism/picnic_site": {"icon": "maki-picnic-site", "fields": ["name", "operator", "address", "access_simple", "capacity"], "moreFields": ["charge_fee", "internet_access", "internet_access/fee", "internet_access/ssid", "smoking", "fee", "level", "payment_multi_fee", "phone", "reservation", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["camp"], "tags": {"tourism": "picnic_site"}, "name": "Picnic Site"},
+    "tourism/theme_park": {"icon": "maki-amusement-park", "fields": ["name", "operator", "address", "opening_hours"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"tourism": "theme_park"}, "name": "Theme Park"},
+    "tourism/trail_riding_station": {"icon": "maki-horse-riding", "fields": ["name", "horse_stables", "horse_riding", "horse_dressage"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "address", "opening_hours", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"tourism": "trail_riding_station"}, "name": "Trail Riding Station", "matchScore": 2},
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "moreFields": ["level"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
-    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["backcountry hut", "bothy", "wilderness hut"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
-    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
-    "tourism/zoo/petting": {"icon": "fas-horse", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Farm", "Children's Zoo", "farm animals", "Petting Farm"], "name": "Petting Zoo"},
-    "tourism/zoo/safari": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "safari_park"}, "reference": {"key": "zoo", "value": "safari_park"}, "terms": ["Drive-In Zoo", "Drive-Through Zoo"], "name": "Safari Park"},
+    "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fee", "payment_multi_fee", "charge_fee", "fireplace"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "reservation", "wheelchair"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
+    "tourism/zoo": {"icon": "temaki-zoo", "fields": ["name", "operator", "address", "opening_hours", "fee", "charge_fee"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
+    "tourism/zoo/petting": {"icon": "fas-horse", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "petting_zoo"}, "reference": {"key": "zoo", "value": "petting_zoo"}, "terms": ["Children's Zoo", "Children's Farm", "Petting Farm", "farm animals"], "name": "Petting Zoo"},
+    "tourism/zoo/safari": {"icon": "temaki-zoo", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "safari_park"}, "reference": {"key": "zoo", "value": "safari_park"}, "terms": ["Drive-Through Zoo", "Drive-In Zoo"], "name": "Safari Park"},
     "tourism/zoo/wildlife": {"icon": "fas-frog", "geometry": ["point", "area"], "tags": {"tourism": "zoo", "zoo": "wildlife_park"}, "reference": {"key": "zoo", "value": "wildlife_park"}, "terms": ["indigenous animals"], "name": "Wildlife Park"},
     "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
-    "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "slow", "speed"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
-    "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["driveway link", "slow", "speed"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"},
-    "traffic_calming/choker": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["slow", "speed"], "tags": {"traffic_calming": "choker"}, "name": "Traffic Choker"},
-    "traffic_calming/cushion": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "hump", "slow", "speed"], "tags": {"traffic_calming": "cushion"}, "name": "Speed Cushion"},
-    "traffic_calming/dip": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["slow", "speed"], "tags": {"traffic_calming": "dip"}, "name": "Dip"},
-    "traffic_calming/hump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "slow", "speed"], "tags": {"traffic_calming": "hump"}, "name": "Speed Hump"},
+    "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
+    "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"},
+    "traffic_calming/choker": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "choker"}, "name": "Traffic Choker"},
+    "traffic_calming/cushion": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "hump", "speed", "slow"], "tags": {"traffic_calming": "cushion"}, "name": "Speed Cushion"},
+    "traffic_calming/dip": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "dip"}, "name": "Dip"},
+    "traffic_calming/hump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "speed", "slow"], "tags": {"traffic_calming": "hump"}, "name": "Speed Hump"},
     "traffic_calming/island": {"icon": "temaki-diamond", "fields": ["surface"], "geometry": ["vertex", "line", "area"], "terms": ["circle", "roundabout", "slow"], "tags": {"traffic_calming": "island"}, "name": "Traffic Island"},
-    "traffic_calming/rumble_strip": {"icon": "temaki-diamond", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "growlers", "sleeper lines"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"},
-    "traffic_calming/table": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "slow", "speed"], "name": "Speed Table"},
-    "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["highway", "road"], "name": "Traffic Sign"},
-    "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "direction"], "geometry": ["point"], "tags": {"traffic_sign": "*"}, "terms": ["highway", "road"], "name": "Traffic Sign"},
-    "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["border", "boundary", "edge", "hamlet", "highway", "road", "town", "village"], "name": "City Limit Sign"},
-    "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "name"], "geometry": ["point"], "tags": {"traffic_sign": "city_limit"}, "terms": ["border", "boundary", "edge", "hamlet", "highway", "road", "town", "village"], "name": "City Limit Sign"},
-    "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["highway", "max speed", "maximum speed", "road"], "name": "Speed Limit Sign"},
-    "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["highway", "max speed", "maximum speed", "road"], "name": "Speed Limit Sign"},
+    "traffic_calming/rumble_strip": {"icon": "temaki-diamond", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "sleeper lines", "growlers"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"},
+    "traffic_calming/table": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"},
+    "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
+    "traffic_sign": {"icon": "fas-directions", "fields": ["traffic_sign", "direction"], "geometry": ["point"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
+    "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
+    "traffic_sign/city_limit": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "name"], "geometry": ["point"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
+    "traffic_sign/maxspeed_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "maxspeed"], "geometry": ["vertex"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
+    "traffic_sign/maxspeed": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction", "maxspeed"], "geometry": ["point"], "tags": {"traffic_sign": "maxspeed"}, "terms": ["max speed", "maximum speed", "road", "highway"], "name": "Speed Limit Sign"},
     "type/multipolygon": {"icon": "iD-multipolygon", "geometry": ["area", "relation"], "tags": {"type": "multipolygon"}, "removeTags": {}, "name": "Multipolygon", "searchable": false, "matchScore": 0.1},
     "type/boundary": {"icon": "iD-boundary", "fields": ["name", "boundary"], "geometry": ["relation"], "tags": {"type": "boundary"}, "name": "Boundary"},
     "type/boundary/administrative": {"icon": "iD-boundary", "fields": ["name", "admin_level"], "geometry": ["relation"], "tags": {"type": "boundary", "boundary": "administrative"}, "reference": {"key": "boundary", "value": "administrative"}, "name": "Administrative Boundary"},
@@ -1225,23 +1225,23 @@
     "type/route/power": {"icon": "iD-power-line", "fields": ["name", "ref_route", "operator", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "power"}, "name": "Power Route"},
     "type/route/road": {"icon": "iD-highway-unclassified", "fields": ["name", "ref_route", "network_road", "to", "from"], "geometry": ["relation"], "tags": {"type": "route", "route": "road"}, "name": "Road Route"},
     "type/route/subway": {"icon": "temaki-subway", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "subway"}, "name": "Subway Route"},
-    "type/route/train": {"icon": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "duration", "interval", "opening_hours", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
+    "type/route/train": {"icon": "iD-railway-rail", "fields": ["name", "ref_route", "operator", "network", "to", "from"], "moreFields": ["colour", "interval", "opening_hours", "duration", "wheelchair"], "geometry": ["relation"], "tags": {"type": "route", "route": "train"}, "name": "Train Route"},
     "type/route/tram": {"icon": "temaki-tram", "fields": ["{type/route/train}"], "moreFields": ["{type/route/train}"], "geometry": ["relation"], "tags": {"type": "route", "route": "tram"}, "name": "Tram Route"},
     "type/site": {"icon": "iD-relation", "fields": ["name", "site"], "geometry": ["relation"], "tags": {"type": "site"}, "name": "Site"},
     "type/waterway": {"icon": "iD-waterway-stream", "fields": ["name", "waterway", "ref"], "geometry": ["relation"], "tags": {"type": "waterway"}, "name": "Waterway"},
     "waterway/riverbank": {"icon": "maki-water", "geometry": ["area"], "tags": {"waterway": "riverbank"}, "name": "Riverbank", "searchable": false},
-    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
+    "waterway/boatyard": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["area", "vertex", "point"], "tags": {"waterway": "boatyard"}, "name": "Boatyard"},
     "waterway/canal": {"icon": "iD-waterway-canal", "fields": ["name", "structure_waterway", "width", "intermittent", "lock"], "moreFields": ["fishing", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal"}, "name": "Canal"},
     "waterway/canal/lock": {"icon": "iD-waterway-canal", "fields": ["name", "width", "lock"], "moreFields": ["intermittent", "salt", "tidal"], "geometry": ["line"], "tags": {"waterway": "canal", "lock": "yes"}, "name": "Canal Lock"},
     "waterway/dam": {"icon": "maki-dam", "geometry": ["point", "vertex", "line", "area"], "fields": ["name", "operator", "height", "material"], "moreFields": ["seamark/type", "website"], "tags": {"waterway": "dam"}, "name": "Dam"},
     "waterway/ditch": {"icon": "iD-waterway-ditch", "fields": ["{waterway/drain}"], "moreFields": ["{waterway/drain}"], "geometry": ["line"], "tags": {"waterway": "ditch"}, "name": "Ditch"},
-    "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "marine", "ship", "vessel"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
+    "waterway/dock": {"icon": "maki-harbor", "fields": ["name", "dock", "operator"], "geometry": ["area", "vertex", "point"], "terms": ["boat", "ship", "vessel", "marine"], "tags": {"waterway": "dock"}, "name": "Wet Dock / Dry Dock"},
     "waterway/drain": {"icon": "iD-waterway-ditch", "fields": ["structure_waterway", "intermittent"], "moreFields": ["covered"], "geometry": ["line"], "tags": {"waterway": "drain"}, "name": "Drain"},
-    "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["brand", "building", "email", "fax", "payment_multi", "phone", "seamark/type", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["boat", "diesel", "gas", "petrol"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
+    "waterway/fuel": {"icon": "maki-fuel", "fields": ["name", "operator", "address", "opening_hours", "fuel_multi"], "moreFields": ["payment_multi", "brand", "seamark/type", "building", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["petrol", "gas", "diesel", "boat"], "tags": {"waterway": "fuel"}, "name": "Marine Fuel Station"},
     "waterway/lock_gate": {"icon": "maki-dam", "geometry": ["vertex", "line"], "fields": ["name", "ref", "height", "material"], "tags": {"waterway": "lock_gate"}, "addTags": {"waterway": "lock_gate", "seamark:type": "gate"}, "terms": ["canal"], "name": "Lock Gate"},
-    "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["marker", "milestone"], "name": "Waterway Milestone"},
+    "waterway/milestone": {"icon": "temaki-milestone", "fields": ["distance", "direction_vertex"], "moreFields": ["seamark/type"], "geometry": ["point", "vertex"], "tags": {"waterway": "milestone"}, "terms": ["milestone", "marker"], "name": "Waterway Milestone"},
     "waterway/river": {"icon": "iD-waterway-river", "fields": ["name", "structure_waterway", "width", "intermittent", "tidal"], "moreFields": ["covered", "fishing", "salt"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "course", "creek", "estuary", "rill", "rivulet", "run", "runnel", "stream", "tributary", "watercourse"], "tags": {"waterway": "river"}, "name": "River"},
-    "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "CDP", "Chemical Toilet", "CTDP", "Dump Station", "Elsan", "Pump out", "Pumpout", "Sanitary", "Watercraft"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
+    "waterway/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["name", "operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours", "seamark/type"], "geometry": ["point", "vertex", "area"], "terms": ["Boat", "Watercraft", "Sanitary", "Dump Station", "Pumpout", "Pump out", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"waterway": "sanitary_dump_station"}, "name": "Marine Toilet Disposal"},
     "waterway/stream_intermittent": {"icon": "iD-waterway-stream", "fields": ["{waterway/stream}"], "moreFields": ["{waterway/stream}"], "geometry": ["line"], "terms": ["arroyo", "beck", "branch", "brook", "burn", "course", "creek", "drift", "flood", "flow", "gully", "run", "runnel", "rush", "spate", "spritz", "tributary", "wadi", "wash", "watercourse"], "tags": {"waterway": "stream", "intermittent": "yes"}, "reference": {"key": "waterway", "value": "stream"}, "name": "Intermittent Stream"},
     "waterway/stream": {"icon": "iD-waterway-stream", "fields": ["name", "structure_waterway", "width", "intermittent"], "moreFields": ["covered", "fishing", "salt", "tidal"], "geometry": ["line"], "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "tags": {"waterway": "stream"}, "name": "Stream"},
     "waterway/water_point": {"icon": "maki-drinking-water", "geometry": ["area", "vertex", "point"], "tags": {"waterway": "water_point"}, "name": "Marine Drinking Water"},
diff --git a/data/presets/presets/advertising/billboard.json b/data/presets/presets/advertising/billboard.json
index 2e4def2ab..1259e8888 100644
--- a/data/presets/presets/advertising/billboard.json
+++ b/data/presets/presets/advertising/billboard.json
@@ -1,7 +1,7 @@
 {
     "fields": [
-        "direction",
-        "lit"
+       "direction",
+       "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/advertising/column.json b/data/presets/presets/advertising/column.json
index 7d893a91c..8be158ff1 100644
--- a/data/presets/presets/advertising/column.json
+++ b/data/presets/presets/advertising/column.json
@@ -1,7 +1,7 @@
 {
     "icon": "temaki-storage_tank",
     "fields": [
-        "lit"
+       "lit"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/aerialway/cable_car.json b/data/presets/presets/aerialway/cable_car.json
index 29eabf9e8..41aaeb8dd 100644
--- a/data/presets/presets/aerialway/cable_car.json
+++ b/data/presets/presets/aerialway/cable_car.json
@@ -4,8 +4,8 @@
         "line"
     ],
     "terms": [
-        "ropeway",
-        "tramway"
+        "tramway",
+        "ropeway"
     ],
     "fields": [
         "name",
diff --git a/data/presets/presets/aerialway/mixed_lift.json b/data/presets/presets/aerialway/mixed_lift.json
index c669a6eb1..43554e19d 100644
--- a/data/presets/presets/aerialway/mixed_lift.json
+++ b/data/presets/presets/aerialway/mixed_lift.json
@@ -3,13 +3,13 @@
         "line"
     ],
     "fields": [
-        "name",
-        "oneway_yes",
-        "aerialway/occupancy",
-        "aerialway/capacity",
-        "aerialway/duration",
-        "aerialway/bubble",
-        "aerialway/heating"
+      "name",
+      "oneway_yes",
+      "aerialway/occupancy",
+      "aerialway/capacity",
+      "aerialway/duration",
+      "aerialway/bubble",
+      "aerialway/heating"
     ],
     "tags": {
         "aerialway": "mixed_lift"
diff --git a/data/presets/presets/aerialway/rope_tow.json b/data/presets/presets/aerialway/rope_tow.json
index cc37f5ce0..a6d4df303 100644
--- a/data/presets/presets/aerialway/rope_tow.json
+++ b/data/presets/presets/aerialway/rope_tow.json
@@ -3,8 +3,8 @@
         "line"
     ],
     "terms": [
-        "bugel lift",
-        "handle tow"
+        "handle tow",
+        "bugel lift"
     ],
     "fields": [
         "name",
diff --git a/data/presets/presets/aeroway/terminal.json b/data/presets/presets/aeroway/terminal.json
index d2f2939bc..d1c978626 100644
--- a/data/presets/presets/aeroway/terminal.json
+++ b/data/presets/presets/aeroway/terminal.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "aerodrome",
-        "airport"
+        "airport",
+        "aerodrome"
     ],
     "fields": [
         "name",
@@ -14,8 +14,8 @@
         "building_area"
     ],
     "moreFields": [
-        "smoking",
-        "wheelchair"
+        "wheelchair",
+        "smoking"
     ],
     "tags": {
         "aeroway": "terminal"
diff --git a/data/presets/presets/amenity/_embassy.json b/data/presets/presets/amenity/_embassy.json
index c2822d5e1..74bdfa3f8 100644
--- a/data/presets/presets/amenity/_embassy.json
+++ b/data/presets/presets/amenity/_embassy.json
@@ -7,10 +7,10 @@
         "building_area"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/_recycling.json b/data/presets/presets/amenity/_recycling.json
index 53f370ca9..9fd440d1b 100644
--- a/data/presets/presets/amenity/_recycling.json
+++ b/data/presets/presets/amenity/_recycling.json
@@ -11,10 +11,10 @@
     ],
     "terms": [
         "bin",
-        "bottle",
         "can",
-        "garbage",
+        "bottle",
         "glass",
+        "garbage",
         "rubbish",
         "scrap",
         "trash"
diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json
index 519afc83b..542043dab 100644
--- a/data/presets/presets/amenity/animal_boarding.json
+++ b/data/presets/presets/amenity/animal_boarding.json
@@ -9,12 +9,12 @@
         "animal_boarding"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/animal_breeding.json b/data/presets/presets/amenity/animal_breeding.json
index d58ca4667..c33222a47 100644
--- a/data/presets/presets/amenity/animal_breeding.json
+++ b/data/presets/presets/amenity/animal_breeding.json
@@ -9,11 +9,11 @@
         "animal_breeding"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/animal_shelter.json b/data/presets/presets/amenity/animal_shelter.json
index c56a4fc85..263b05139 100644
--- a/data/presets/presets/amenity/animal_shelter.json
+++ b/data/presets/presets/amenity/animal_shelter.json
@@ -9,11 +9,11 @@
         "animal_shelter"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -29,12 +29,12 @@
         "kitten",
         "pet care",
         "pet rescue",
-        "pound",
         "puppy",
         "raptor",
         "reptile",
         "rescue",
-        "spca"
+        "spca",
+        "pound"
     ],
     "tags": {
         "amenity": "animal_shelter"
diff --git a/data/presets/presets/amenity/arts_centre.json b/data/presets/presets/amenity/arts_centre.json
index 9a658be81..841925690 100644
--- a/data/presets/presets/amenity/arts_centre.json
+++ b/data/presets/presets/amenity/arts_centre.json
@@ -25,7 +25,8 @@
         "point",
         "area"
     ],
-    "terms": [],
+    "terms": [
+    ],
     "tags": {
         "amenity": "arts_centre"
     },
diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json
index 6e7d4acb4..f84229a45 100644
--- a/data/presets/presets/amenity/atm.json
+++ b/data/presets/presets/amenity/atm.json
@@ -24,9 +24,9 @@
         "vertex"
     ],
     "terms": [
+        "money",
         "cash",
-        "machine",
-        "money"
+        "machine"
     ],
     "tags": {
         "amenity": "atm"
diff --git a/data/presets/presets/amenity/bank.json b/data/presets/presets/amenity/bank.json
index 28899bc4e..d272dd1ef 100644
--- a/data/presets/presets/amenity/bank.json
+++ b/data/presets/presets/amenity/bank.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-bank",
     "fields": [
-        "name",
+	    "name",
         "operator",
         "address",
         "building_area",
@@ -27,8 +27,8 @@
         "area"
     ],
     "terms": [
-        "check",
         "credit union",
+        "check",
         "deposit",
         "fund",
         "investment",
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
index 7936cbb8d..ad1696397 100644
--- a/data/presets/presets/amenity/bar.json
+++ b/data/presets/presets/amenity/bar.json
@@ -29,10 +29,10 @@
         "area"
     ],
     "terms": [
+        "dive",
         "beer",
         "bier",
-        "booze",
-        "dive"
+        "booze"
     ],
     "tags": {
         "amenity": "bar"
diff --git a/data/presets/presets/amenity/bar/lgbtq.json b/data/presets/presets/amenity/bar/lgbtq.json
index fe3d29da5..2944b7440 100644
--- a/data/presets/presets/amenity/bar/lgbtq.json
+++ b/data/presets/presets/amenity/bar/lgbtq.json
@@ -7,9 +7,9 @@
     "terms": [
         "gay bar",
         "lesbian bar",
-        "lgb bar",
+        "lgbtq bar",
         "lgbt bar",
-        "lgbtq bar"
+        "lgb bar"
     ],
     "tags": {
         "amenity": "bar",
diff --git a/data/presets/presets/amenity/bench.json b/data/presets/presets/amenity/bench.json
index 70642fa92..a0cbbbbf3 100644
--- a/data/presets/presets/amenity/bench.json
+++ b/data/presets/presets/amenity/bench.json
@@ -21,8 +21,8 @@
         "line"
     ],
     "terms": [
-        "chair",
-        "seat"
+        "seat",
+        "chair"
     ],
     "tags": {
         "amenity": "bench"
diff --git a/data/presets/presets/amenity/bicycle_parking/lockers.json b/data/presets/presets/amenity/bicycle_parking/lockers.json
index 14f2c46ef..ba78e0187 100644
--- a/data/presets/presets/amenity/bicycle_parking/lockers.json
+++ b/data/presets/presets/amenity/bicycle_parking/lockers.json
@@ -13,9 +13,9 @@
         "key": "bicycle_parking"
     },
     "terms": [
-        "Bike Lockers",
         "cycle locker",
-        "cycling"
+        "cycling",
+        "Bike Lockers"
     ],
     "name": "Bicycle Lockers"
 }
diff --git a/data/presets/presets/amenity/bicycle_parking/shed.json b/data/presets/presets/amenity/bicycle_parking/shed.json
index 6a6811a98..f8fa3d03b 100644
--- a/data/presets/presets/amenity/bicycle_parking/shed.json
+++ b/data/presets/presets/amenity/bicycle_parking/shed.json
@@ -17,9 +17,9 @@
         "key": "bicycle_parking"
     },
     "terms": [
-        "Bike Shed",
         "cycle shed",
-        "cycling"
+        "cycling",
+        "Bike Shed"
     ],
     "name": "Bicycle Shed"
 }
diff --git a/data/presets/presets/amenity/bicycle_rental.json b/data/presets/presets/amenity/bicycle_rental.json
index 9a39b50c6..fde94d208 100644
--- a/data/presets/presets/amenity/bicycle_rental.json
+++ b/data/presets/presets/amenity/bicycle_rental.json
@@ -10,8 +10,8 @@
     ],
     "moreFields": [
         "address",
-        "covered",
         "email",
+        "covered",
         "fax",
         "level",
         "opening_hours",
@@ -25,11 +25,11 @@
         "area"
     ],
     "terms": [
-        "bicycle",
-        "bicycle share",
         "bike",
-        "bike share",
+        "bicycle",
         "bikeshare",
+        "bike share",
+        "bicycle share",
         "cycle dock",
         "cycle hub",
         "cycleshare",
diff --git a/data/presets/presets/amenity/boat_rental.json b/data/presets/presets/amenity/boat_rental.json
index b7c4be724..3218ddf31 100644
--- a/data/presets/presets/amenity/boat_rental.json
+++ b/data/presets/presets/amenity/boat_rental.json
@@ -10,10 +10,10 @@
     ],
     "moreFields": [
         "address",
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/bureau_de_change.json b/data/presets/presets/amenity/bureau_de_change.json
index 9486661f4..ef62abb13 100644
--- a/data/presets/presets/amenity/bureau_de_change.json
+++ b/data/presets/presets/amenity/bureau_de_change.json
@@ -9,12 +9,12 @@
         "building_area"
     ],
     "moreFields": [
+        "opening_hours",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "opening_hours",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_pooling.json b/data/presets/presets/amenity/car_pooling.json
index 2e7801b91..8f04613c2 100644
--- a/data/presets/presets/amenity/car_pooling.json
+++ b/data/presets/presets/amenity/car_pooling.json
@@ -10,10 +10,10 @@
         "lit"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_rental.json b/data/presets/presets/amenity/car_rental.json
index d570c1943..4b33a4b6d 100644
--- a/data/presets/presets/amenity/car_rental.json
+++ b/data/presets/presets/amenity/car_rental.json
@@ -9,10 +9,10 @@
     ],
     "moreFields": [
         "brand",
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_sharing.json b/data/presets/presets/amenity/car_sharing.json
index 3f8756e29..3afa5b55b 100644
--- a/data/presets/presets/amenity/car_sharing.json
+++ b/data/presets/presets/amenity/car_sharing.json
@@ -10,11 +10,11 @@
         "supervised"
     ],
     "moreFields": [
+        "lit",
+        "website",
+        "phone",
         "email",
         "fax",
-        "lit",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/car_wash.json b/data/presets/presets/amenity/car_wash.json
index 7f8cfdb8d..71191c521 100644
--- a/data/presets/presets/amenity/car_wash.json
+++ b/data/presets/presets/amenity/car_wash.json
@@ -10,10 +10,10 @@
         "self_service"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/casino.json b/data/presets/presets/amenity/casino.json
index 887d8a8a1..96b0a756c 100644
--- a/data/presets/presets/amenity/casino.json
+++ b/data/presets/presets/amenity/casino.json
@@ -27,11 +27,11 @@
         "area"
     ],
     "terms": [
-        "blackjack",
-        "craps",
         "gambling",
+        "roulette",
+        "craps",
         "poker",
-        "roulette"
+        "blackjack"
     ],
     "tags": {
         "amenity": "casino"
diff --git a/data/presets/presets/amenity/charging_station.json b/data/presets/presets/amenity/charging_station.json
index ec150a23d..f8125b461 100644
--- a/data/presets/presets/amenity/charging_station.json
+++ b/data/presets/presets/amenity/charging_station.json
@@ -22,8 +22,8 @@
         "amenity": "charging_station"
     },
     "terms": [
-        "Electric Vehicle",
         "EV",
+        "Electric Vehicle",
         "Supercharger"
     ],
     "name": "Charging Station"
diff --git a/data/presets/presets/amenity/childcare.json b/data/presets/presets/amenity/childcare.json
index 7444dd577..eb3f43d32 100644
--- a/data/presets/presets/amenity/childcare.json
+++ b/data/presets/presets/amenity/childcare.json
@@ -12,8 +12,8 @@
         "email",
         "fax",
         "level",
-        "max_age",
         "min_age",
+        "max_age",
         "payment_multi",
         "phone",
         "website",
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
index 6e45f9601..5c8b82924 100644
--- a/data/presets/presets/amenity/cinema.json
+++ b/data/presets/presets/amenity/cinema.json
@@ -27,10 +27,10 @@
         "film",
         "flick",
         "movie",
+        "theater",
         "picture",
-        "screen",
         "show",
-        "theater"
+        "screen"
     ],
     "tags": {
         "amenity": "cinema"
diff --git a/data/presets/presets/amenity/clinic.json b/data/presets/presets/amenity/clinic.json
index 720fbc644..3f67cbc7c 100644
--- a/data/presets/presets/amenity/clinic.json
+++ b/data/presets/presets/amenity/clinic.json
@@ -11,12 +11,12 @@
     ],
     "moreFields": [
         "air_conditioning",
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/clinic/abortion.json b/data/presets/presets/amenity/clinic/abortion.json
index 54305eaac..c6b0d820a 100644
--- a/data/presets/presets/amenity/clinic/abortion.json
+++ b/data/presets/presets/amenity/clinic/abortion.json
@@ -4,7 +4,8 @@
         "point",
         "area"
     ],
-    "terms": [],
+    "terms": [
+    ],
     "tags": {
         "amenity": "clinic",
         "healthcare": "clinic",
diff --git a/data/presets/presets/amenity/clinic/fertility.json b/data/presets/presets/amenity/clinic/fertility.json
index 2dde77ab1..2642deb62 100644
--- a/data/presets/presets/amenity/clinic/fertility.json
+++ b/data/presets/presets/amenity/clinic/fertility.json
@@ -7,9 +7,9 @@
     "terms": [
         "egg",
         "fertility",
-        "ovulation",
         "reproductive",
-        "sperm"
+        "sperm",
+        "ovulation"
     ],
     "tags": {
         "amenity": "clinic",
diff --git a/data/presets/presets/amenity/clock.json b/data/presets/presets/amenity/clock.json
index 03175dc37..a13d03035 100644
--- a/data/presets/presets/amenity/clock.json
+++ b/data/presets/presets/amenity/clock.json
@@ -20,7 +20,7 @@
         "point",
         "vertex"
     ],
-    "terms": [
+    "terms":[
         "time"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/college.json b/data/presets/presets/amenity/college.json
index 52c3b487d..7d7884509 100644
--- a/data/presets/presets/amenity/college.json
+++ b/data/presets/presets/amenity/college.json
@@ -10,12 +10,12 @@
         "internet_access/fee"
     ],
     "moreFields": [
+        "religion",
         "denomination",
-        "email",
-        "fax",
         "internet_access/ssid",
         "phone",
-        "religion",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -23,8 +23,8 @@
         "area"
     ],
     "terms": [
-        "undergraduate school",
-        "university"
+        "university",
+        "undergraduate school"
     ],
     "tags": {
         "amenity": "college"
diff --git a/data/presets/presets/amenity/community_centre/lgbtq.json b/data/presets/presets/amenity/community_centre/lgbtq.json
index 86c483070..f6fbef8d0 100644
--- a/data/presets/presets/amenity/community_centre/lgbtq.json
+++ b/data/presets/presets/amenity/community_centre/lgbtq.json
@@ -5,12 +5,12 @@
         "area"
     ],
     "terms": [
-        "lgb event",
-        "lgb hall",
+        "lgbtq event",
+        "lgbtq hall",
         "lgbt event",
         "lgbt hall",
-        "lgbtq event",
-        "lgbtq hall"
+        "lgb event",
+        "lgb hall"
     ],
     "tags": {
         "amenity": "community_centre",
diff --git a/data/presets/presets/amenity/conference_centre.json b/data/presets/presets/amenity/conference_centre.json
index d6921622d..fbece2906 100644
--- a/data/presets/presets/amenity/conference_centre.json
+++ b/data/presets/presets/amenity/conference_centre.json
@@ -8,7 +8,7 @@
         "website",
         "internet_access"
     ],
-    "moreFields": [
+    "moreFields" : [
         "air_conditioning",
         "email",
         "fax",
diff --git a/data/presets/presets/amenity/crematorium.json b/data/presets/presets/amenity/crematorium.json
index b8bfd88ac..dd740b92e 100644
--- a/data/presets/presets/amenity/crematorium.json
+++ b/data/presets/presets/amenity/crematorium.json
@@ -9,11 +9,11 @@
     ],
     "moreFields": [
         "address",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/dentist.json b/data/presets/presets/amenity/dentist.json
index b73cdea77..8f45f89bf 100644
--- a/data/presets/presets/amenity/dentist.json
+++ b/data/presets/presets/amenity/dentist.json
@@ -9,12 +9,12 @@
         "opening_hours"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -22,8 +22,8 @@
         "area"
     ],
     "terms": [
-        "teeth",
-        "tooth"
+        "tooth",
+        "teeth"
     ],
     "tags": {
         "amenity": "dentist"
diff --git a/data/presets/presets/amenity/dive_centre.json b/data/presets/presets/amenity/dive_centre.json
index 2c3c9f77c..f985715e1 100644
--- a/data/presets/presets/amenity/dive_centre.json
+++ b/data/presets/presets/amenity/dive_centre.json
@@ -9,12 +9,12 @@
         "scuba_diving"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/doctors.json b/data/presets/presets/amenity/doctors.json
index eb11b46a5..ecc6a3645 100644
--- a/data/presets/presets/amenity/doctors.json
+++ b/data/presets/presets/amenity/doctors.json
@@ -9,12 +9,12 @@
         "opening_hours"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
index d8be2e61a..2862983e2 100644
--- a/data/presets/presets/amenity/dojo.json
+++ b/data/presets/presets/amenity/dojo.json
@@ -8,21 +8,21 @@
         "opening_hours"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
-    "geometry": [
+    "geometry" : [
         "point",
         "area"
     ],
     "terms": [
-        "dojang",
-        "martial arts"
+        "martial arts",
+        "dojang"
     ],
     "tags": {
         "amenity": "dojo"
diff --git a/data/presets/presets/amenity/drinking_water.json b/data/presets/presets/amenity/drinking_water.json
index 063c12560..19b80403a 100644
--- a/data/presets/presets/amenity/drinking_water.json
+++ b/data/presets/presets/amenity/drinking_water.json
@@ -21,10 +21,10 @@
         "amenity": "drinking_water"
     },
     "terms": [
-        "bubbler",
-        "drinking fountain",
         "potable water source",
         "water fountain",
+        "drinking fountain",
+        "bubbler",
         "water tap"
     ],
     "name": "Drinking Water"
diff --git a/data/presets/presets/amenity/driving_school.json b/data/presets/presets/amenity/driving_school.json
index 3f26d297f..a885cc8b4 100644
--- a/data/presets/presets/amenity/driving_school.json
+++ b/data/presets/presets/amenity/driving_school.json
@@ -9,12 +9,12 @@
         "opening_hours"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/events_venue.json b/data/presets/presets/amenity/events_venue.json
index cd8be4011..ffc3f5347 100644
--- a/data/presets/presets/amenity/events_venue.json
+++ b/data/presets/presets/amenity/events_venue.json
@@ -10,7 +10,7 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
-    "moreFields": [
+    "moreFields" : [
         "air_conditioning",
         "email",
         "fax",
diff --git a/data/presets/presets/amenity/fast_food.json b/data/presets/presets/amenity/fast_food.json
index 3ff164cac..23a881927 100644
--- a/data/presets/presets/amenity/fast_food.json
+++ b/data/presets/presets/amenity/fast_food.json
@@ -10,22 +10,22 @@
     ],
     "moreFields": [
         "air_conditioning",
-        "capacity",
-        "delivery",
+        "opening_hours",
         "diet_multi",
-        "email",
-        "fax",
+        "takeaway",
+        "delivery",
+        "smoking",
+        "capacity",
+        "outdoor_seating",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "level",
-        "opening_hours",
-        "outdoor_seating",
         "payment_multi",
-        "phone",
-        "smoking",
-        "takeaway",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/fast_food/donut.json b/data/presets/presets/amenity/fast_food/donut.json
index 98cc2e729..e10b92da2 100644
--- a/data/presets/presets/amenity/fast_food/donut.json
+++ b/data/presets/presets/amenity/fast_food/donut.json
@@ -12,9 +12,9 @@
         "coffee",
         "dine",
         "diner",
-        "dining",
         "donut",
         "doughnut",
+        "dining",
         "eat",
         "lunch",
         "table"
diff --git a/data/presets/presets/amenity/fast_food/fish_and_chips.json b/data/presets/presets/amenity/fast_food/fish_and_chips.json
index 1dcf1161a..27a2cf412 100644
--- a/data/presets/presets/amenity/fast_food/fish_and_chips.json
+++ b/data/presets/presets/amenity/fast_food/fish_and_chips.json
@@ -13,10 +13,10 @@
         "dinner",
         "drive-in",
         "eat",
-        "french fries",
         "grill",
         "lunch",
-        "table"
+        "table",
+        "french fries"
     ],
     "tags": {
         "amenity": "fast_food",
diff --git a/data/presets/presets/amenity/fast_food/mexican.json b/data/presets/presets/amenity/fast_food/mexican.json
index 16e212471..827815f74 100644
--- a/data/presets/presets/amenity/fast_food/mexican.json
+++ b/data/presets/presets/amenity/fast_food/mexican.json
@@ -6,23 +6,23 @@
     ],
     "terms": [
         "breakfast",
-        "burritos",
         "dine",
         "dining",
         "dinner",
         "drive-in",
         "eat",
-        "enchiladas",
-        "fajitas",
         "grill",
         "lunch",
-        "nachos",
-        "quesadillas",
-        "salsa",
         "table",
         "tacos",
+        "burritos",
+        "enchiladas",
+        "fajitas",
+        "nachos",
+        "tortillas",
+        "salsa",
         "tamales",
-        "tortillas"
+        "quesadillas"
     ],
     "tags": {
         "amenity": "fast_food",
diff --git a/data/presets/presets/amenity/fast_food/pizza.json b/data/presets/presets/amenity/fast_food/pizza.json
index ce06f271c..35050aa35 100644
--- a/data/presets/presets/amenity/fast_food/pizza.json
+++ b/data/presets/presets/amenity/fast_food/pizza.json
@@ -5,16 +5,16 @@
         "area"
     ],
     "terms": [
-        "deep dish",
         "dine",
         "dining",
         "dinner",
         "drive-in",
         "eat",
         "lunch",
-        "slice",
         "table",
-        "thin crust"
+        "deep dish",
+        "thin crust",
+        "slice"
     ],
     "tags": {
         "amenity": "fast_food",
diff --git a/data/presets/presets/amenity/food_court.json b/data/presets/presets/amenity/food_court.json
index 32195a9b9..c11919f2b 100644
--- a/data/presets/presets/amenity/food_court.json
+++ b/data/presets/presets/amenity/food_court.json
@@ -8,18 +8,18 @@
         "opening_hours"
     ],
     "moreFields": [
+        "smoking",
+        "outdoor_seating",
         "capacity",
-        "diet_multi",
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "level",
-        "outdoor_seating",
-        "phone",
-        "smoking",
+        "diet_multi",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -28,8 +28,8 @@
     ],
     "terms": [
         "fast food",
-        "food",
-        "restaurant"
+        "restaurant",
+        "food"
     ],
     "tags": {
         "amenity": "food_court"
diff --git a/data/presets/presets/amenity/fuel.json b/data/presets/presets/amenity/fuel.json
index 76e0a626c..97370c581 100644
--- a/data/presets/presets/amenity/fuel.json
+++ b/data/presets/presets/amenity/fuel.json
@@ -9,13 +9,13 @@
         "self_service"
     ],
     "moreFields": [
-        "building",
-        "email",
-        "fax",
         "opening_hours",
         "payment_multi",
-        "phone",
+        "building",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -23,14 +23,14 @@
         "area"
     ],
     "terms": [
-        "biodiesel",
-        "cng",
-        "diesel",
+        "petrol",
         "fuel",
         "gasoline",
+        "propane",
+        "diesel",
         "lng",
-        "petrol",
-        "propane"
+        "cng",
+        "biodiesel"
     ],
     "tags": {
         "amenity": "fuel"
diff --git a/data/presets/presets/amenity/grave_yard.json b/data/presets/presets/amenity/grave_yard.json
index 77d483e6d..0f6c60eb1 100644
--- a/data/presets/presets/amenity/grave_yard.json
+++ b/data/presets/presets/amenity/grave_yard.json
@@ -5,10 +5,10 @@
         "address"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index 665a070aa..ff219e0f0 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -9,13 +9,13 @@
         "emergency"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/hunting_stand.json b/data/presets/presets/amenity/hunting_stand.json
index 5ef50e36b..f77aa5c84 100644
--- a/data/presets/presets/amenity/hunting_stand.json
+++ b/data/presets/presets/amenity/hunting_stand.json
@@ -15,8 +15,8 @@
         "lookout",
         "rifle",
         "shoot*",
-        "watch",
-        "wild"
+        "wild",
+        "watch"
     ],
     "tags": {
         "amenity": "hunting_stand"
diff --git a/data/presets/presets/amenity/ice_cream.json b/data/presets/presets/amenity/ice_cream.json
index 42d799830..68d0bbd23 100644
--- a/data/presets/presets/amenity/ice_cream.json
+++ b/data/presets/presets/amenity/ice_cream.json
@@ -8,19 +8,19 @@
         "outdoor_seating"
     ],
     "moreFields": [
+        "takeaway",
         "delivery",
-        "diet_multi",
         "drive_through",
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "level",
+        "diet_multi",
         "payment_multi",
-        "phone",
-        "takeaway",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -28,10 +28,10 @@
         "area"
     ],
     "terms": [
-        "frozen",
         "gelato",
-        "sherbet",
         "sorbet",
+        "sherbet",
+        "frozen",
         "yogurt"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/internet_cafe.json b/data/presets/presets/amenity/internet_cafe.json
index 93c5c6ac8..dd12acc21 100644
--- a/data/presets/presets/amenity/internet_cafe.json
+++ b/data/presets/presets/amenity/internet_cafe.json
@@ -29,14 +29,14 @@
         "area"
     ],
     "terms": [
-        "cafe",
-        "coffee",
         "cybercafe",
-        "lanhouse",
-        "net",
         "taxiphone",
-        "teleboutique"
-    ],
+        "teleboutique",
+        "coffee",
+        "cafe",
+        "net",
+        "lanhouse"
+     ],
     "tags": {
         "amenity": "internet_cafe"
     },
diff --git a/data/presets/presets/amenity/kindergarten.json b/data/presets/presets/amenity/kindergarten.json
index 27a9feebb..449ef24e2 100644
--- a/data/presets/presets/amenity/kindergarten.json
+++ b/data/presets/presets/amenity/kindergarten.json
@@ -10,9 +10,9 @@
     "moreFields": [
         "email",
         "fax",
-        "level",
-        "max_age",
         "min_age",
+        "max_age",
+        "level",
         "opening_hours",
         "payment_multi",
         "website",
diff --git a/data/presets/presets/amenity/letter_box.json b/data/presets/presets/amenity/letter_box.json
index 8f1d3804e..8b95050a8 100644
--- a/data/presets/presets/amenity/letter_box.json
+++ b/data/presets/presets/amenity/letter_box.json
@@ -26,8 +26,8 @@
     },
     "terms": [
         "curbside delivery box",
-        "direct-to-door delivery box",
         "home delivery box",
+        "direct-to-door delivery box",
         "letter hole",
         "letter plate",
         "letter slot",
diff --git a/data/presets/presets/amenity/library.json b/data/presets/presets/amenity/library.json
index 7a1910036..a4693e8cd 100644
--- a/data/presets/presets/amenity/library.json
+++ b/data/presets/presets/amenity/library.json
@@ -11,14 +11,14 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
-    "moreFields": [
+    "moreFields" : [
         "access_simple",
         "air_conditioning",
         "email",
         "fax",
-        "level",
         "opening_hours",
         "payment_multi",
+        "level",
         "phone",
         "polling_station",
         "website",
diff --git a/data/presets/presets/amenity/love_hotel.json b/data/presets/presets/amenity/love_hotel.json
index ae9aa2c2d..d9b4c0389 100644
--- a/data/presets/presets/amenity/love_hotel.json
+++ b/data/presets/presets/amenity/love_hotel.json
@@ -10,7 +10,7 @@
         "internet_access/fee",
         "internet_access/ssid"
     ],
-    "moreFields": [
+    "moreFields" : [
         "email",
         "fax",
         "min_age",
diff --git a/data/presets/presets/amenity/marketplace.json b/data/presets/presets/amenity/marketplace.json
index cc33fc810..638f391af 100644
--- a/data/presets/presets/amenity/marketplace.json
+++ b/data/presets/presets/amenity/marketplace.json
@@ -8,10 +8,10 @@
         "opening_hours"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/monastery.json b/data/presets/presets/amenity/monastery.json
index 0a1611e63..a6592a462 100644
--- a/data/presets/presets/amenity/monastery.json
+++ b/data/presets/presets/amenity/monastery.json
@@ -8,10 +8,10 @@
         "building_area"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/money_transfer.json b/data/presets/presets/amenity/money_transfer.json
index e5d1f7fcf..47a2d8a86 100644
--- a/data/presets/presets/amenity/money_transfer.json
+++ b/data/presets/presets/amenity/money_transfer.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-bank",
     "fields": [
-        "name",
+	    "name",
         "brand",
         "address",
         "building_area",
@@ -9,12 +9,12 @@
         "currency_multi"
     ],
     "moreFields": [
+        "opening_hours",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "opening_hours",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -22,16 +22,16 @@
         "area"
     ],
     "terms": [
-        "bill",
-        "cable",
-        "cash to cash",
-        "check",
-        "currency",
-        "exchange",
-        "finance",
         "money order",
+        "check",
+        "bill",
+        "currency",
+        "finance",
+        "wire transfer",
+        "cable",
         "person to person",
-        "wire transfer"
+        "cash to cash",
+        "exchange"
     ],
     "tags": {
         "amenity": "money_transfer"
diff --git a/data/presets/presets/amenity/music_school.json b/data/presets/presets/amenity/music_school.json
index dc2f99473..e17cdae60 100644
--- a/data/presets/presets/amenity/music_school.json
+++ b/data/presets/presets/amenity/music_school.json
@@ -8,12 +8,12 @@
         "opening_hours"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/nightclub.json b/data/presets/presets/amenity/nightclub.json
index 281a0881c..19fb90469 100644
--- a/data/presets/presets/amenity/nightclub.json
+++ b/data/presets/presets/amenity/nightclub.json
@@ -27,10 +27,10 @@
         "amenity": "nightclub"
     },
     "terms": [
-        "dance club",
-        "dancing",
-        "disco*",
-        "night club"
+       "disco*",
+       "night club",
+       "dancing",
+       "dance club"
     ],
     "name": "Nightclub"
 }
diff --git a/data/presets/presets/amenity/nightclub/lgbtq.json b/data/presets/presets/amenity/nightclub/lgbtq.json
index 1c070ed94..5d12f78d8 100644
--- a/data/presets/presets/amenity/nightclub/lgbtq.json
+++ b/data/presets/presets/amenity/nightclub/lgbtq.json
@@ -11,9 +11,9 @@
     "terms": [
         "gay nightclub",
         "lesbian nightclub",
-        "lgb nightclub",
+        "lgbtq nightclub",
         "lgbt nightclub",
-        "lgbtq nightclub"
+        "lgb nightclub"
     ],
     "name": "LGBTQ+ Nightclub"
 }
diff --git a/data/presets/presets/amenity/parking/multi-storey.json b/data/presets/presets/amenity/parking/multi-storey.json
index 69d55fc36..9cb7ebe9f 100644
--- a/data/presets/presets/amenity/parking/multi-storey.json
+++ b/data/presets/presets/amenity/parking/multi-storey.json
@@ -7,8 +7,8 @@
     ],
     "moreFields": [
         "{amenity/parking}",
-        "height",
-        "levels"
+        "levels",
+        "height"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/amenity/parking/park_ride.json b/data/presets/presets/amenity/parking/park_ride.json
index 525c196ee..bdc28aee8 100644
--- a/data/presets/presets/amenity/parking/park_ride.json
+++ b/data/presets/presets/amenity/parking/park_ride.json
@@ -17,11 +17,11 @@
         "commuter parking lot",
         "incentive parking lot",
         "metro parking lot",
-        "P+R",
         "park and pool lot",
         "park and ride lot",
-        "public transit parking lot",
+        "P+R",
         "public transport parking lot",
+        "public transit parking lot",
         "train parking lot"
     ],
     "name": "Park & Ride Lot"
diff --git a/data/presets/presets/amenity/payment_centre.json b/data/presets/presets/amenity/payment_centre.json
index c166f750f..db1907680 100644
--- a/data/presets/presets/amenity/payment_centre.json
+++ b/data/presets/presets/amenity/payment_centre.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-bank",
     "fields": [
-        "name",
+	    "name",
         "brand",
         "address",
         "building_area",
@@ -10,11 +10,11 @@
     ],
     "moreFields": [
         "currency_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -22,13 +22,13 @@
         "area"
     ],
     "terms": [
-        "bill pay",
-        "cash",
         "check",
+        "tax pay",
+        "bill pay",
         "currency",
         "finance",
-        "money",
-        "tax pay"
+        "cash",
+        "money"
     ],
     "tags": {
         "amenity": "payment_centre"
diff --git a/data/presets/presets/amenity/payment_terminal.json b/data/presets/presets/amenity/payment_terminal.json
index 72f012e06..ee0083992 100644
--- a/data/presets/presets/amenity/payment_terminal.json
+++ b/data/presets/presets/amenity/payment_terminal.json
@@ -1,7 +1,7 @@
 {
     "icon": "far-credit-card",
     "fields": [
-        "name",
+	    "name",
         "brand",
         "address",
         "opening_hours",
@@ -18,16 +18,16 @@
         "point"
     ],
     "terms": [
+        "interactive kiosk",
+        "ekiosk",
         "atm",
         "bill pay",
-        "card",
-        "cash",
-        "ekiosk",
-        "finance",
-        "interactive kiosk",
-        "money transfer",
+        "tax pay",
         "phone pay",
-        "tax pay"
+        "finance",
+        "cash",
+        "money transfer",
+        "card"
     ],
     "tags": {
         "amenity": "payment_terminal"
diff --git a/data/presets/presets/amenity/pharmacy.json b/data/presets/presets/amenity/pharmacy.json
index 8237fa8d3..5c2a4c9b9 100644
--- a/data/presets/presets/amenity/pharmacy.json
+++ b/data/presets/presets/amenity/pharmacy.json
@@ -9,13 +9,13 @@
         "dispensing"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "level",
         "opening_hours",
         "payment_multi",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/amenity/photo_booth.json b/data/presets/presets/amenity/photo_booth.json
index f68dcb508..819b0a3d2 100644
--- a/data/presets/presets/amenity/photo_booth.json
+++ b/data/presets/presets/amenity/photo_booth.json
@@ -1,29 +1,29 @@
 {
-    "icon": "fas-person-booth",
-    "fields": [
-        "name",
-        "operator",
-        "payment_multi",
-        "wheelchair"
-    ],
-    "moreFields": [
-        "brand",
-        "indoor",
-        "level"
-    ],
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "terms": [
-        "booth",
-        "camera",
-        "kiosk",
-        "photo",
-        "photobooth"
-    ],
-    "tags": {
-        "amenity": "photo_booth"
-    },
-    "name": "Photo Booth"
+	"icon": "fas-person-booth",
+	"fields": [
+		"name",
+		"operator",
+		"payment_multi",
+		"wheelchair"
+	],
+	"moreFields": [
+		"brand",
+		"indoor",
+		"level"
+	],
+	"geometry": [
+		"point",
+		"area"
+	],
+	"terms": [
+		"photobooth",
+		"photo",
+		"booth",
+		"kiosk",
+		"camera"
+	],
+	"tags": {
+		"amenity": "photo_booth"
+	},
+	"name": "Photo Booth"
 }
diff --git a/data/presets/presets/amenity/place_of_worship/buddhist.json b/data/presets/presets/amenity/place_of_worship/buddhist.json
index 4a792400a..0f6e78743 100644
--- a/data/presets/presets/amenity/place_of_worship/buddhist.json
+++ b/data/presets/presets/amenity/place_of_worship/buddhist.json
@@ -11,13 +11,13 @@
         "area"
     ],
     "terms": [
-        "dojo",
-        "monastery",
-        "pagoda",
         "stupa",
-        "temple",
         "vihara",
-        "zendo"
+        "monastery",
+        "temple",
+        "pagoda",
+        "zendo",
+        "dojo"
     ],
     "tags": {
         "amenity": "place_of_worship",
diff --git a/data/presets/presets/amenity/place_of_worship/christian.json b/data/presets/presets/amenity/place_of_worship/christian.json
index 4322655d9..8a2f8999c 100644
--- a/data/presets/presets/amenity/place_of_worship/christian.json
+++ b/data/presets/presets/amenity/place_of_worship/christian.json
@@ -11,6 +11,7 @@
         "area"
     ],
     "terms": [
+        "christian",
         "abbey",
         "basilica",
         "bethel",
@@ -18,7 +19,6 @@
         "chancel",
         "chantry",
         "chapel",
-        "christian",
         "fold",
         "house of God",
         "house of prayer",
diff --git a/data/presets/presets/amenity/place_of_worship/hindu.json b/data/presets/presets/amenity/place_of_worship/hindu.json
index fd96fd648..dc49d5c77 100644
--- a/data/presets/presets/amenity/place_of_worship/hindu.json
+++ b/data/presets/presets/amenity/place_of_worship/hindu.json
@@ -11,11 +11,11 @@
         "area"
     ],
     "terms": [
-        "alayam",
-        "devasthana",
         "kovil",
-        "kshetram",
+        "devasthana",
         "mandir",
+        "kshetram",
+        "alayam",
         "shrine",
         "temple"
     ],
diff --git a/data/presets/presets/amenity/planetarium.json b/data/presets/presets/amenity/planetarium.json
index 374d6d9bd..e305cf1e7 100644
--- a/data/presets/presets/amenity/planetarium.json
+++ b/data/presets/presets/amenity/planetarium.json
@@ -10,12 +10,12 @@
     "moreFields": [
         "air_conditioning",
         "charge_fee",
-        "email",
-        "fax",
         "fee",
         "payment_multi_fee",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -23,8 +23,8 @@
         "area"
     ],
     "terms": [
-        "astronomy",
         "museum",
+        "astronomy",
         "observatory"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/police.json b/data/presets/presets/amenity/police.json
index 849e2353e..df9879b36 100644
--- a/data/presets/presets/amenity/police.json
+++ b/data/presets/presets/amenity/police.json
@@ -26,9 +26,9 @@
         "constabulary",
         "cop",
         "detective",
-        "enforcement",
         "fed",
         "law",
+        "enforcement",
         "officer",
         "patrol"
     ],
diff --git a/data/presets/presets/amenity/prep_school.json b/data/presets/presets/amenity/prep_school.json
index 0fa8a3915..62931f5e6 100644
--- a/data/presets/presets/amenity/prep_school.json
+++ b/data/presets/presets/amenity/prep_school.json
@@ -8,12 +8,12 @@
         "opening_hours"
     ],
     "moreFields": [
+        "payment_multi",
+        "website",
+        "phone",
         "email",
         "fax",
         "level",
-        "payment_multi",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -23,10 +23,10 @@
     "terms": [
         "academic",
         "ACT",
+        "SAT",
         "homework",
         "math",
         "reading",
-        "SAT",
         "test prep",
         "tutoring",
         "writing"
diff --git a/data/presets/presets/amenity/prison.json b/data/presets/presets/amenity/prison.json
index 0b6a54d30..20ff3f871 100644
--- a/data/presets/presets/amenity/prison.json
+++ b/data/presets/presets/amenity/prison.json
@@ -7,10 +7,10 @@
         "address"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -19,8 +19,8 @@
     ],
     "terms": [
         "cell",
-        "correction",
-        "jail"
+        "jail",
+        "correction"
     ],
     "tags": {
         "amenity": "prison"
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
index 83b38ff52..ca943bd4e 100644
--- a/data/presets/presets/amenity/pub.json
+++ b/data/presets/presets/amenity/pub.json
@@ -34,11 +34,11 @@
     },
     "terms": [
         "alcohol",
+        "drink",
+        "dive",
         "beer",
         "bier",
-        "booze",
-        "dive",
-        "drink"
+        "booze"
     ],
     "name": "Pub"
 }
diff --git a/data/presets/presets/amenity/pub/lgbtq.json b/data/presets/presets/amenity/pub/lgbtq.json
index 8692850ae..f8c3b9f82 100644
--- a/data/presets/presets/amenity/pub/lgbtq.json
+++ b/data/presets/presets/amenity/pub/lgbtq.json
@@ -11,9 +11,9 @@
     "terms": [
         "gay pub",
         "lesbian pub",
-        "lgb pub",
+        "lgbtq pub",
         "lgbt pub",
-        "lgbtq pub"
+        "lgb pub"
     ],
     "name": "LGBTQ+ Pub"
 }
diff --git a/data/presets/presets/amenity/pub/microbrewery.json b/data/presets/presets/amenity/pub/microbrewery.json
index b73281eb3..d02868d3d 100644
--- a/data/presets/presets/amenity/pub/microbrewery.json
+++ b/data/presets/presets/amenity/pub/microbrewery.json
@@ -13,12 +13,12 @@
     },
     "terms": [
         "alcohol",
+        "drink",
+        "dive",
         "beer",
         "bier",
         "booze",
         "craft brewery",
-        "dive",
-        "drink",
         "microbrewery",
         "small batch brewery"
     ],
diff --git a/data/presets/presets/amenity/public_bath.json b/data/presets/presets/amenity/public_bath.json
index 655806cf5..0fa486d14 100644
--- a/data/presets/presets/amenity/public_bath.json
+++ b/data/presets/presets/amenity/public_bath.json
@@ -30,9 +30,9 @@
         "amenity": "public_bath"
     },
     "terms": [
+        "onsen",
         "foot bath",
-        "hot springs",
-        "onsen"
+        "hot springs"
     ],
     "name": "Public Bath"
 }
diff --git a/data/presets/presets/amenity/public_bookcase.json b/data/presets/presets/amenity/public_bookcase.json
index 5513db4fb..dcd36eafc 100644
--- a/data/presets/presets/amenity/public_bookcase.json
+++ b/data/presets/presets/amenity/public_bookcase.json
@@ -25,8 +25,8 @@
         "area"
     ],
     "terms": [
-        "bookcrossing",
-        "library"
+        "library",
+        "bookcrossing"
     ],
     "tags": {
         "amenity": "public_bookcase"
diff --git a/data/presets/presets/amenity/ranger_station.json b/data/presets/presets/amenity/ranger_station.json
index 24d863724..504646b1f 100644
--- a/data/presets/presets/amenity/ranger_station.json
+++ b/data/presets/presets/amenity/ranger_station.json
@@ -22,13 +22,13 @@
         "area"
     ],
     "terms": [
-        "backcountry office",
-        "permit center",
-        "permit centre",
         "visitor center",
         "visitor centre",
-        "warden center",
-        "warden office"
+        "permit center",
+        "permit centre",
+        "backcountry office",
+        "warden office",
+        "warden center"
     ],
     "tags": {
         "amenity": "ranger_station"
diff --git a/data/presets/presets/amenity/recycling/container/green_waste.json b/data/presets/presets/amenity/recycling/container/green_waste.json
index f5f4d67fa..02f591668 100644
--- a/data/presets/presets/amenity/recycling/container/green_waste.json
+++ b/data/presets/presets/amenity/recycling/container/green_waste.json
@@ -15,11 +15,11 @@
         "biological",
         "compost",
         "decomposable",
-        "food scrap",
         "garbage bin",
         "garden waste",
         "organic",
-        "rubbish"
+        "rubbish",
+        "food scrap"
     ],
     "tags": {
         "amenity": "recycling",
diff --git a/data/presets/presets/amenity/recycling_centre.json b/data/presets/presets/amenity/recycling_centre.json
index e54a172ef..40ffe93c5 100644
--- a/data/presets/presets/amenity/recycling_centre.json
+++ b/data/presets/presets/amenity/recycling_centre.json
@@ -11,12 +11,12 @@
     ],
     "moreFields": [
         "charge_fee",
-        "email",
-        "fax",
         "fee",
         "payment_multi_fee",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -27,8 +27,8 @@
         "bottle",
         "can",
         "dump",
-        "garbage",
         "glass",
+        "garbage",
         "rubbish",
         "scrap",
         "trash"
diff --git a/data/presets/presets/amenity/recycling_container.json b/data/presets/presets/amenity/recycling_container.json
index d07b43a5a..28c8c4aa4 100644
--- a/data/presets/presets/amenity/recycling_container.json
+++ b/data/presets/presets/amenity/recycling_container.json
@@ -20,10 +20,10 @@
     ],
     "terms": [
         "bin",
-        "bottle",
         "can",
-        "garbage",
+        "bottle",
         "glass",
+        "garbage",
         "rubbish",
         "scrap",
         "trash"
diff --git a/data/presets/presets/amenity/restaurant/greek.json b/data/presets/presets/amenity/restaurant/greek.json
index 5240f3307..b961bd445 100644
--- a/data/presets/presets/amenity/restaurant/greek.json
+++ b/data/presets/presets/amenity/restaurant/greek.json
@@ -16,11 +16,11 @@
         "drive-in",
         "eat",
         "grill",
-        "gyros",
         "lunch",
-        "olives",
+        "table",
+        "gyros",
         "pitas",
-        "table"
+        "olives"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/indian.json b/data/presets/presets/amenity/restaurant/indian.json
index 936aa216d..5dc8b4b84 100644
--- a/data/presets/presets/amenity/restaurant/indian.json
+++ b/data/presets/presets/amenity/restaurant/indian.json
@@ -7,7 +7,6 @@
     "terms": [
         "bar",
         "breakfast",
-        "curry",
         "dine",
         "dining",
         "dinner",
@@ -15,7 +14,8 @@
         "eat",
         "grill",
         "lunch",
-        "table"
+        "table",
+        "curry"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/italian.json b/data/presets/presets/amenity/restaurant/italian.json
index 5a338da74..6cf56079e 100644
--- a/data/presets/presets/amenity/restaurant/italian.json
+++ b/data/presets/presets/amenity/restaurant/italian.json
@@ -17,9 +17,9 @@
         "eat",
         "grill",
         "lunch",
+        "table",
         "pasta",
-        "pizza",
-        "table"
+        "pizza"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/mexican.json b/data/presets/presets/amenity/restaurant/mexican.json
index 4622184dc..aa8d3441a 100644
--- a/data/presets/presets/amenity/restaurant/mexican.json
+++ b/data/presets/presets/amenity/restaurant/mexican.json
@@ -7,23 +7,23 @@
     "terms": [
         "bar",
         "breakfast",
-        "burritos",
         "dine",
         "dining",
         "dinner",
         "drive-in",
         "eat",
-        "enchiladas",
-        "fajitas",
         "grill",
         "lunch",
-        "nachos",
-        "quesadillas",
-        "salsa",
         "table",
         "tacos",
+        "burritos",
+        "enchiladas",
+        "fajitas",
+        "nachos",
+        "tortillas",
+        "salsa",
         "tamales",
-        "tortillas"
+        "quesadillas"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/noodle.json b/data/presets/presets/amenity/restaurant/noodle.json
index 490a0232a..8fdf8238c 100644
--- a/data/presets/presets/amenity/restaurant/noodle.json
+++ b/data/presets/presets/amenity/restaurant/noodle.json
@@ -10,7 +10,6 @@
         "cafe",
         "café",
         "canteen",
-        "cellophane noodles",
         "dine",
         "dining",
         "dinner",
@@ -18,11 +17,12 @@
         "eat",
         "grill",
         "lunch",
+        "table",
         "ramen noodles",
-        "rice noodles",
-        "soba noodles",
         "soup",
-        "table"
+        "soba noodles",
+        "cellophane noodles",
+        "rice noodles"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/pizza.json b/data/presets/presets/amenity/restaurant/pizza.json
index 84e73cce1..14efffe16 100644
--- a/data/presets/presets/amenity/restaurant/pizza.json
+++ b/data/presets/presets/amenity/restaurant/pizza.json
@@ -6,16 +6,16 @@
     ],
     "terms": [
         "bar",
-        "deep dish",
         "dine",
         "dining",
         "dinner",
         "drive-in",
         "eat",
         "lunch",
-        "slice",
         "table",
-        "thin crust"
+        "deep dish",
+        "thin crust",
+        "slice"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/seafood.json b/data/presets/presets/amenity/restaurant/seafood.json
index 361db18ee..2c84a23d2 100644
--- a/data/presets/presets/amenity/restaurant/seafood.json
+++ b/data/presets/presets/amenity/restaurant/seafood.json
@@ -9,25 +9,25 @@
         "breakfast",
         "cafe",
         "café",
-        "clams",
-        "crab",
-        "crustaceans",
         "dine",
         "dining",
         "dinner",
         "drive-in",
         "eat",
-        "fish",
         "grill",
-        "lobsters",
         "lunch",
-        "molluscs",
-        "octopus",
-        "oysters",
+        "table",
+        "fish",
         "shellfish",
+        "molluscs",
+        "crustaceans",
+        "clams",
+        "oysters",
+        "lobsters",
+        "crab",
         "shrimp",
         "squid",
-        "table"
+        "octopus"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/restaurant/steakhouse.json b/data/presets/presets/amenity/restaurant/steakhouse.json
index 78d986e94..77d8ebe39 100644
--- a/data/presets/presets/amenity/restaurant/steakhouse.json
+++ b/data/presets/presets/amenity/restaurant/steakhouse.json
@@ -6,12 +6,10 @@
     ],
     "terms": [
         "bar",
-        "beef",
         "breakfast",
         "cafe",
         "café",
         "canteen",
-        "chop house",
         "dine",
         "dining",
         "dinner",
@@ -19,8 +17,10 @@
         "eat",
         "grill",
         "lunch",
+        "table",
         "steak house",
-        "table"
+        "chop house",
+        "beef"
     ],
     "tags": {
         "amenity": "restaurant",
diff --git a/data/presets/presets/amenity/sanitary_dump_station.json b/data/presets/presets/amenity/sanitary_dump_station.json
index 767f1643a..9ef3265b6 100644
--- a/data/presets/presets/amenity/sanitary_dump_station.json
+++ b/data/presets/presets/amenity/sanitary_dump_station.json
@@ -17,14 +17,14 @@
         "area"
     ],
     "terms": [
+        "Motor Home",
         "Camper",
-        "CDP",
-        "Chemical Toilet",
-        "CTDP",
+        "Sanitary",
         "Dump Station",
         "Elsan",
-        "Motor Home",
-        "Sanitary"
+        "CDP",
+        "CTDP",
+        "Chemical Toilet"
     ],
     "tags": {
         "amenity": "sanitary_dump_station"
diff --git a/data/presets/presets/amenity/school.json b/data/presets/presets/amenity/school.json
index 86cfcecbb..141e93024 100644
--- a/data/presets/presets/amenity/school.json
+++ b/data/presets/presets/amenity/school.json
@@ -28,8 +28,8 @@
     "terms": [
         "academy",
         "elementary school",
-        "high school",
-        "middle school"
+        "middle school",
+        "high school"
     ],
     "tags": {
         "amenity": "school"
diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json
index e05805c60..16f276840 100644
--- a/data/presets/presets/amenity/shelter.json
+++ b/data/presets/presets/amenity/shelter.json
@@ -18,8 +18,8 @@
         "area"
     ],
     "terms": [
-        "gazebo",
         "lean-to",
+        "gazebo",
         "picnic"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/shower.json b/data/presets/presets/amenity/shower.json
index c32e62e87..deb3e131a 100644
--- a/data/presets/presets/amenity/shower.json
+++ b/data/presets/presets/amenity/shower.json
@@ -12,9 +12,9 @@
     ],
     "moreFields": [
         "address",
-        "gender",
         "level",
-        "operator"
+        "operator",
+        "gender"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/smoking_area.json b/data/presets/presets/amenity/smoking_area.json
index 8fa7f5157..b153ece27 100644
--- a/data/presets/presets/amenity/smoking_area.json
+++ b/data/presets/presets/amenity/smoking_area.json
@@ -8,17 +8,18 @@
         "opening_hours"
     ],
     "moreFields": [
-        "covered",
         "level",
         "lit",
-        "wheelchair"
+        "wheelchair",
+        "covered"
     ],
     "geometry": [
         "point",
         "vertex",
         "area"
     ],
-    "terms": [],
+    "terms": [
+    ],
     "tags": {
         "amenity": "smoking_area"
     },
diff --git a/data/presets/presets/amenity/social_facility/food_bank.json b/data/presets/presets/amenity/social_facility/food_bank.json
index e1da92324..a951c42c5 100644
--- a/data/presets/presets/amenity/social_facility/food_bank.json
+++ b/data/presets/presets/amenity/social_facility/food_bank.json
@@ -4,7 +4,8 @@
         "point",
         "area"
     ],
-    "terms": [],
+    "terms": [
+    ],
     "tags": {
         "amenity": "social_facility",
         "social_facility": "food_bank"
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index e1cd7ddc8..ae16ca82c 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -9,11 +9,11 @@
         "area"
     ],
     "terms": [
-        "assisted living",
-        "care home",
-        "living",
         "old",
-        "senior"
+        "senior",
+        "living",
+        "care home",
+        "assisted living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/social_facility/homeless_shelter.json b/data/presets/presets/amenity/social_facility/homeless_shelter.json
index a98f058eb..6640e61c1 100644
--- a/data/presets/presets/amenity/social_facility/homeless_shelter.json
+++ b/data/presets/presets/amenity/social_facility/homeless_shelter.json
@@ -5,9 +5,9 @@
         "area"
     ],
     "terms": [
-        "displaced",
         "houseless",
-        "unhoused"
+        "unhoused",
+        "displaced"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/social_facility/nursing_home.json b/data/presets/presets/amenity/social_facility/nursing_home.json
index e767c7d23..f837796e2 100644
--- a/data/presets/presets/amenity/social_facility/nursing_home.json
+++ b/data/presets/presets/amenity/social_facility/nursing_home.json
@@ -9,12 +9,12 @@
         "area"
     ],
     "terms": [
-        "assisted living",
         "elderly",
         "living",
         "nursing",
         "old",
-        "senior"
+        "senior",
+        "assisted living"
     ],
     "tags": {
         "amenity": "social_facility",
diff --git a/data/presets/presets/amenity/studio.json b/data/presets/presets/amenity/studio.json
index e35aa2f92..d7e969103 100644
--- a/data/presets/presets/amenity/studio.json
+++ b/data/presets/presets/amenity/studio.json
@@ -22,8 +22,8 @@
         "area"
     ],
     "terms": [
-        "radio",
         "recording",
+        "radio",
         "television"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/telephone.json b/data/presets/presets/amenity/telephone.json
index cca13f6e8..a8bec40db 100644
--- a/data/presets/presets/amenity/telephone.json
+++ b/data/presets/presets/amenity/telephone.json
@@ -22,7 +22,7 @@
     "tags": {
         "amenity": "telephone"
     },
-    "terms": [
+    "terms":  [
         "phone"
     ],
     "name": "Telephone"
diff --git a/data/presets/presets/amenity/theatre.json b/data/presets/presets/amenity/theatre.json
index 7e60d0f6c..989320bf0 100644
--- a/data/presets/presets/amenity/theatre.json
+++ b/data/presets/presets/amenity/theatre.json
@@ -1,7 +1,7 @@
 {
     "icon": "maki-theatre",
     "fields": [
-        "name",
+	    "name",
         "operator",
         "address",
         "building_area",
@@ -25,10 +25,10 @@
         "area"
     ],
     "terms": [
-        "musical",
+        "theatre",
         "performance",
         "play",
-        "theatre"
+        "musical"
     ],
     "tags": {
         "amenity": "theatre"
diff --git a/data/presets/presets/amenity/theatre/type/amphi.json b/data/presets/presets/amenity/theatre/type/amphi.json
index dd39656d1..6d18e1e5f 100644
--- a/data/presets/presets/amenity/theatre/type/amphi.json
+++ b/data/presets/presets/amenity/theatre/type/amphi.json
@@ -7,14 +7,13 @@
         "lit"
     ],
     "geometry": [
-        "point",
-        "area"
+        "point", "area"
     ],
     "terms": [
-        "ampi",
-        "greek",
         "open air",
-        "outdoor"
+        "outdoor",
+        "greek",
+        "ampi"
     ],
     "tags": {
         "amenity": "theatre",
diff --git a/data/presets/presets/amenity/toilets.json b/data/presets/presets/amenity/toilets.json
index b67d52a2f..f01fc9fdd 100644
--- a/data/presets/presets/amenity/toilets.json
+++ b/data/presets/presets/amenity/toilets.json
@@ -25,15 +25,15 @@
     ],
     "terms": [
         "bathroom",
-        "head",
-        "latrine",
-        "lavatory",
+        "restroom",
         "outhouse",
         "privy",
-        "restroom",
-        "W.C.",
+        "head",
+        "lavatory",
+        "latrine",
         "water closet",
-        "WC"
+        "WC",
+        "W.C."
     ],
     "tags": {
         "amenity": "toilets"
diff --git a/data/presets/presets/amenity/toilets/disposal/flush.json b/data/presets/presets/amenity/toilets/disposal/flush.json
index 04aae886e..f681e9e95 100644
--- a/data/presets/presets/amenity/toilets/disposal/flush.json
+++ b/data/presets/presets/amenity/toilets/disposal/flush.json
@@ -18,9 +18,9 @@
         "lavatory",
         "privy",
         "restroom",
-        "W.C.",
         "water closet",
-        "WC"
+        "WC",
+        "W.C."
     ],
     "tags": {
         "amenity": "toilets",
diff --git a/data/presets/presets/amenity/townhall.json b/data/presets/presets/amenity/townhall.json
index 739824d1c..8cb522d09 100644
--- a/data/presets/presets/amenity/townhall.json
+++ b/data/presets/presets/amenity/townhall.json
@@ -20,11 +20,11 @@
         "area"
     ],
     "terms": [
+        "village",
         "city",
-        "courthouse",
         "government",
-        "municipal",
-        "village"
+        "courthouse",
+        "municipal"
     ],
     "tags": {
         "amenity": "townhall"
diff --git a/data/presets/presets/amenity/university.json b/data/presets/presets/amenity/university.json
index c6e0f97fd..e79f7caf0 100644
--- a/data/presets/presets/amenity/university.json
+++ b/data/presets/presets/amenity/university.json
@@ -13,8 +13,8 @@
     "terms": [
         "college",
         "graduate school",
-        "master's degree program",
-        "PhD program"
+        "PhD program",
+        "master's degree program"
     ],
     "tags": {
         "amenity": "university"
diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json
index d24377526..054b2fe9c 100644
--- a/data/presets/presets/amenity/vending_machine.json
+++ b/data/presets/presets/amenity/vending_machine.json
@@ -18,7 +18,8 @@
     "geometry": [
         "point"
     ],
-    "terms": [],
+    "terms": [
+    ],
     "tags": {
         "amenity": "vending_machine"
     },
diff --git a/data/presets/presets/amenity/vending_machine/drinks.json b/data/presets/presets/amenity/vending_machine/drinks.json
index 41f1a3ece..8dd2d96e6 100644
--- a/data/presets/presets/amenity/vending_machine/drinks.json
+++ b/data/presets/presets/amenity/vending_machine/drinks.json
@@ -4,11 +4,11 @@
         "point"
     ],
     "terms": [
-        "beverage",
         "drink",
+        "soda",
+        "beverage",
         "juice",
-        "pop",
-        "soda"
+        "pop"
     ],
     "tags": {
         "amenity": "vending_machine",
diff --git a/data/presets/presets/amenity/vending_machine/excrement_bags.json b/data/presets/presets/amenity/vending_machine/excrement_bags.json
index 486f6d3af..216cf5c48 100644
--- a/data/presets/presets/amenity/vending_machine/excrement_bags.json
+++ b/data/presets/presets/amenity/vending_machine/excrement_bags.json
@@ -7,11 +7,11 @@
         "point"
     ],
     "terms": [
-        "animal",
-        "dog",
         "excrement bags",
         "poop",
-        "waste"
+        "waste",
+        "dog",
+        "animal"
     ],
     "tags": {
         "amenity": "vending_machine",
diff --git a/data/presets/presets/amenity/vending_machine/feminine_hygiene.json b/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
index 44b66ec26..d636434b8 100644
--- a/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
+++ b/data/presets/presets/amenity/vending_machine/feminine_hygiene.json
@@ -5,12 +5,12 @@
     ],
     "terms": [
         "condom",
-        "menstrual hygiene products",
-        "pad",
-        "personal care",
         "tampon",
+        "pad",
         "woman",
-        "women"
+        "women",
+        "menstrual hygiene products",
+        "personal care"
     ],
     "tags": {
         "amenity": "vending_machine",
diff --git a/data/presets/presets/amenity/vending_machine/fuel.json b/data/presets/presets/amenity/vending_machine/fuel.json
index 876944128..efb5b52a2 100644
--- a/data/presets/presets/amenity/vending_machine/fuel.json
+++ b/data/presets/presets/amenity/vending_machine/fuel.json
@@ -4,14 +4,14 @@
         "point"
     ],
     "terms": [
-        "biodiesel",
-        "cng",
-        "diesel",
+        "petrol",
         "fuel",
         "gasoline",
+        "propane",
+        "diesel",
         "lng",
-        "petrol",
-        "propane"
+        "cng",
+        "biodiesel"
     ],
     "tags": {
         "amenity": "vending_machine",
diff --git a/data/presets/presets/amenity/vending_machine/ice_cream.json b/data/presets/presets/amenity/vending_machine/ice_cream.json
index a831563c2..9cc7e7dd7 100644
--- a/data/presets/presets/amenity/vending_machine/ice_cream.json
+++ b/data/presets/presets/amenity/vending_machine/ice_cream.json
@@ -5,8 +5,8 @@
     ],
     "terms": [
         "chocolate",
-        "frozen",
         "ice cream",
+        "frozen",
         "popsicle",
         "vanilla"
     ],
diff --git a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
index 62bb86f6c..a3960ce94 100644
--- a/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
+++ b/data/presets/presets/amenity/vending_machine/public_transport_tickets.json
@@ -5,10 +5,10 @@
     ],
     "terms": [
         "bus",
+        "train",
         "ferry",
         "rail",
         "ticket",
-        "train",
         "transportation"
     ],
     "tags": {
diff --git a/data/presets/presets/amenity/vending_machine/sweets.json b/data/presets/presets/amenity/vending_machine/sweets.json
index c507063c0..c0e13ec65 100644
--- a/data/presets/presets/amenity/vending_machine/sweets.json
+++ b/data/presets/presets/amenity/vending_machine/sweets.json
@@ -5,11 +5,11 @@
     ],
     "terms": [
         "candy",
-        "chip",
-        "cookie",
-        "cracker",
         "gum",
-        "pretzel"
+        "chip",
+        "pretzel",
+        "cookie",
+        "cracker"
     ],
     "tags": {
         "amenity": "vending_machine",
diff --git a/data/presets/presets/amenity/veterinary.json b/data/presets/presets/amenity/veterinary.json
index 35c2e8bc7..02a708e62 100644
--- a/data/presets/presets/amenity/veterinary.json
+++ b/data/presets/presets/amenity/veterinary.json
@@ -9,13 +9,13 @@
     ],
     "moreFields": [
         "charge_fee",
-        "email",
-        "fax",
         "fee",
         "level",
         "payment_multi_fee",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -23,10 +23,10 @@
         "area"
     ],
     "terms": [
-        "animal hospital",
         "pet clinic",
-        "pet doctor",
-        "veterinarian"
+        "veterinarian",
+        "animal hospital",
+        "pet doctor"
     ],
     "tags": {
         "amenity": "veterinary"
diff --git a/data/presets/presets/amenity/waste/dog_excrement.json b/data/presets/presets/amenity/waste/dog_excrement.json
index eca3f0634..c42d0a35b 100644
--- a/data/presets/presets/amenity/waste/dog_excrement.json
+++ b/data/presets/presets/amenity/waste/dog_excrement.json
@@ -18,12 +18,12 @@
     },
     "terms": [
         "bin",
-        "dog",
         "garbage",
-        "litter",
-        "poo",
         "rubbish",
-        "trash"
+        "litter",
+        "trash",
+        "poo",
+        "dog"
     ],
     "name": "Dog Excrement Bin"
 }
diff --git a/data/presets/presets/amenity/waste_basket.json b/data/presets/presets/amenity/waste_basket.json
index 214941e06..c482eb067 100644
--- a/data/presets/presets/amenity/waste_basket.json
+++ b/data/presets/presets/amenity/waste_basket.json
@@ -22,8 +22,8 @@
     "terms": [
         "bin",
         "garbage",
-        "litter",
         "rubbish",
+        "litter",
         "trash"
     ],
     "name": "Waste Basket"
diff --git a/data/presets/presets/amenity/waste_disposal.json b/data/presets/presets/amenity/waste_disposal.json
index 009dfc3e3..457745c1c 100644
--- a/data/presets/presets/amenity/waste_disposal.json
+++ b/data/presets/presets/amenity/waste_disposal.json
@@ -23,8 +23,8 @@
     },
     "terms": [
         "garbage",
-        "litter",
         "rubbish",
+        "litter",
         "trash"
     ],
     "name": "Garbage Dumpster"
diff --git a/data/presets/presets/attraction/amusement_ride.json b/data/presets/presets/attraction/amusement_ride.json
index 424091e08..8a7acbe70 100644
--- a/data/presets/presets/attraction/amusement_ride.json
+++ b/data/presets/presets/attraction/amusement_ride.json
@@ -10,8 +10,8 @@
         "area"
     ],
     "terms": [
-        "carnival ride",
-        "theme park"
+        "theme park",
+        "carnival ride"
     ],
     "tags": {
         "attraction": "amusement_ride"
diff --git a/data/presets/presets/attraction/big_wheel.json b/data/presets/presets/attraction/big_wheel.json
index 2e5db9dc9..d926d2c2a 100644
--- a/data/presets/presets/attraction/big_wheel.json
+++ b/data/presets/presets/attraction/big_wheel.json
@@ -13,9 +13,9 @@
         "point"
     ],
     "terms": [
-        "amusement ride",
         "ferris wheel",
-        "theme park"
+        "theme park",
+        "amusement ride"
     ],
     "tags": {
         "attraction": "big_wheel"
diff --git a/data/presets/presets/attraction/bumper_car.json b/data/presets/presets/attraction/bumper_car.json
index 631f9d3ca..6b2d057ed 100644
--- a/data/presets/presets/attraction/bumper_car.json
+++ b/data/presets/presets/attraction/bumper_car.json
@@ -10,9 +10,9 @@
         "area"
     ],
     "terms": [
-        "autoscooter",
+        "theme park",
         "dodgem cars",
-        "theme park"
+        "autoscooter"
     ],
     "tags": {
         "attraction": "bumper_car"
diff --git a/data/presets/presets/attraction/bungee_jumping.json b/data/presets/presets/attraction/bungee_jumping.json
index 8eb487a69..64032ea6f 100644
--- a/data/presets/presets/attraction/bungee_jumping.json
+++ b/data/presets/presets/attraction/bungee_jumping.json
@@ -14,9 +14,9 @@
         "area"
     ],
     "terms": [
+        "theme park",
         "bungy jumping",
-        "jumping platform",
-        "theme park"
+        "jumping platform"
     ],
     "tags": {
         "attraction": "bungee_jumping"
diff --git a/data/presets/presets/attraction/carousel.json b/data/presets/presets/attraction/carousel.json
index 58437d47b..f3f1c7eba 100644
--- a/data/presets/presets/attraction/carousel.json
+++ b/data/presets/presets/attraction/carousel.json
@@ -14,13 +14,13 @@
         "area"
     ],
     "terms": [
-        "flying horses",
-        "galloper",
-        "horseabout",
-        "jumper",
-        "merry-go-round",
+        "theme park",
         "roundabout",
-        "theme park"
+        "merry-go-round",
+        "galloper",
+        "jumper",
+        "horseabout",
+        "flying horses"
     ],
     "tags": {
         "attraction": "carousel"
diff --git a/data/presets/presets/attraction/dark_ride.json b/data/presets/presets/attraction/dark_ride.json
index de9bf6838..2fd721d10 100644
--- a/data/presets/presets/attraction/dark_ride.json
+++ b/data/presets/presets/attraction/dark_ride.json
@@ -15,8 +15,8 @@
         "area"
     ],
     "terms": [
-        "ghost train",
-        "theme park"
+        "theme park",
+        "ghost train"
     ],
     "tags": {
         "attraction": "dark_ride"
diff --git a/data/presets/presets/attraction/drop_tower.json b/data/presets/presets/attraction/drop_tower.json
index fb75a8497..80f169990 100644
--- a/data/presets/presets/attraction/drop_tower.json
+++ b/data/presets/presets/attraction/drop_tower.json
@@ -14,11 +14,11 @@
         "area"
     ],
     "terms": [
-        "amusement ride",
-        "big drop",
-        "gondola",
         "theme park",
-        "tower"
+        "amusement ride",
+        "gondola",
+        "tower",
+        "big drop"
     ],
     "tags": {
         "attraction": "drop_tower"
diff --git a/data/presets/presets/attraction/maze.json b/data/presets/presets/attraction/maze.json
index 65fb9e06c..5e6f3fc59 100644
--- a/data/presets/presets/attraction/maze.json
+++ b/data/presets/presets/attraction/maze.json
@@ -10,9 +10,9 @@
         "area"
     ],
     "terms": [
+        "theme park",
         "amusement ride",
-        "labyrinth",
-        "theme park"
+        "labyrinth"
     ],
     "tags": {
         "attraction": "maze"
diff --git a/data/presets/presets/attraction/pirate_ship.json b/data/presets/presets/attraction/pirate_ship.json
index f60192501..2c02be3a5 100644
--- a/data/presets/presets/attraction/pirate_ship.json
+++ b/data/presets/presets/attraction/pirate_ship.json
@@ -9,9 +9,9 @@
         "point"
     ],
     "terms": [
-        "amusement ride",
+        "theme park",
         "carnival ride",
-        "theme park"
+        "amusement ride"
     ],
     "tags": {
         "attraction": "pirate_ship"
diff --git a/data/presets/presets/attraction/river_rafting.json b/data/presets/presets/attraction/river_rafting.json
index e4feb80d1..cc5086d72 100644
--- a/data/presets/presets/attraction/river_rafting.json
+++ b/data/presets/presets/attraction/river_rafting.json
@@ -10,12 +10,12 @@
         "line"
     ],
     "terms": [
+        "theme park",
         "aquatic park",
+        "water park",
         "rafting simulator",
         "river rafting ride",
-        "river rapids ride",
-        "theme park",
-        "water park"
+        "river rapids ride"
     ],
     "tags": {
         "attraction": "river_rafting"
diff --git a/data/presets/presets/attraction/roller_coaster.json b/data/presets/presets/attraction/roller_coaster.json
index 33fd5944b..ff4ab086e 100644
--- a/data/presets/presets/attraction/roller_coaster.json
+++ b/data/presets/presets/attraction/roller_coaster.json
@@ -10,8 +10,8 @@
         "area"
     ],
     "terms": [
-        "amusement ride",
-        "theme park"
+        "theme park",
+        "amusement ride"
     ],
     "tags": {
         "attraction": "roller_coaster"
diff --git a/data/presets/presets/attraction/train.json b/data/presets/presets/attraction/train.json
index 7c14ddd55..ebe8139a3 100644
--- a/data/presets/presets/attraction/train.json
+++ b/data/presets/presets/attraction/train.json
@@ -10,12 +10,12 @@
         "line"
     ],
     "terms": [
-        "dotto train",
-        "park train",
+        "theme park",
         "rackless train",
         "road train",
-        "theme park",
-        "Tschu-Tschu train"
+        "Tschu-Tschu train",
+        "dotto train",
+        "park train"
     ],
     "tags": {
         "attraction": "train"
diff --git a/data/presets/presets/attraction/water_slide.json b/data/presets/presets/attraction/water_slide.json
index 82cddc5e3..69fcae879 100644
--- a/data/presets/presets/attraction/water_slide.json
+++ b/data/presets/presets/attraction/water_slide.json
@@ -14,12 +14,12 @@
         "area"
     ],
     "terms": [
-        "aquatic park",
-        "flumes",
-        "hydroslides",
         "theme park",
+        "aquatic park",
+        "water park",
+        "flumes",
         "water chutes",
-        "water park"
+        "hydroslides"
     ],
     "tags": {
         "attraction": "water_slide"
diff --git a/data/presets/presets/barrier/border_control.json b/data/presets/presets/barrier/border_control.json
index 18d77a2b3..61d9573e0 100644
--- a/data/presets/presets/barrier/border_control.json
+++ b/data/presets/presets/barrier/border_control.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "vertex",
diff --git a/data/presets/presets/barrier/fence/railing.json b/data/presets/presets/barrier/fence/railing.json
index 5ea493d1a..4b9e410d0 100644
--- a/data/presets/presets/barrier/fence/railing.json
+++ b/data/presets/presets/barrier/fence/railing.json
@@ -8,9 +8,9 @@
         "fence_type": "railing"
     },
     "terms": [
-        "guard rail",
+        "railing",
         "handrail",
-        "railing"
+        "guard rail"
     ],
     "name": "Railing",
     "matchScore": 0.5
diff --git a/data/presets/presets/barrier/guard_rail.json b/data/presets/presets/barrier/guard_rail.json
index 11c4ebd41..0e4978de2 100644
--- a/data/presets/presets/barrier/guard_rail.json
+++ b/data/presets/presets/barrier/guard_rail.json
@@ -11,12 +11,12 @@
     },
     "name": "Guard Rail",
     "terms": [
-        "Armco barrier",
-        "crash barrier",
         "guardrail",
+        "traffic barrier",
+        "crash barrier",
         "median barrier",
         "roadside barrier",
-        "traffic barrier"
+        "Armco barrier"
     ],
     "matchScore": 0.75
 }
diff --git a/data/presets/presets/barrier/height_restrictor.json b/data/presets/presets/barrier/height_restrictor.json
index 3c255a863..072185832 100644
--- a/data/presets/presets/barrier/height_restrictor.json
+++ b/data/presets/presets/barrier/height_restrictor.json
@@ -3,9 +3,7 @@
     "fields": [
         "maxheight"
     ],
-    "geometry": [
-        "vertex"
-    ],
+    "geometry": [ "vertex" ],
     "tags": {
         "barrier": "height_restrictor"
     },
diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json
index 1c55a9c5c..bdc5ced5a 100644
--- a/data/presets/presets/barrier/kerb.json
+++ b/data/presets/presets/barrier/kerb.json
@@ -15,6 +15,6 @@
     "tags": {
         "barrier": "kerb"
     },
-    "matchScore": 0.5,
+    "matchScore": 0.50,
     "name": "Curb"
 }
diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json
index c6915de69..c45a46caa 100644
--- a/data/presets/presets/barrier/kerb/lowered.json
+++ b/data/presets/presets/barrier/kerb/lowered.json
@@ -23,8 +23,8 @@
     "terms": [
         "curb cut",
         "curb ramp",
-        "dropped kerb",
         "kerb ramp",
+        "dropped kerb",
         "pram ramp"
     ],
     "matchScore": 0.55,
diff --git a/data/presets/presets/barrier/sally_port.json b/data/presets/presets/barrier/sally_port.json
index c87fea28c..67b24afa3 100644
--- a/data/presets/presets/barrier/sally_port.json
+++ b/data/presets/presets/barrier/sally_port.json
@@ -7,8 +7,8 @@
         "barrier": "sally_port"
     },
     "terms": [
-        "castle side gate",
-        "Postern"
+        "Postern",
+        "castle side gate"
     ],
     "name": "Sally Port"
 }
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 6db75c722..63db553f2 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -11,8 +11,8 @@
         "architect",
         "building/levels/underground",
         "building/material",
-        "layer",
         "not/name",
+        "layer",
         "operator",
         "roof/colour",
         "smoking",
diff --git a/data/presets/presets/building/bungalow.json b/data/presets/presets/building/bungalow.json
index 7d2e3474e..1cce91d96 100644
--- a/data/presets/presets/building/bungalow.json
+++ b/data/presets/presets/building/bungalow.json
@@ -7,8 +7,8 @@
         "building": "bungalow"
     },
     "terms": [
-        "detached",
-        "home"
+        "home",
+        "detached"
     ],
     "matchScore": 0.5,
     "name": "Bungalow"
diff --git a/data/presets/presets/building/carport.json b/data/presets/presets/building/carport.json
index f3460228f..dac54e2d0 100644
--- a/data/presets/presets/building/carport.json
+++ b/data/presets/presets/building/carport.json
@@ -12,9 +12,9 @@
     },
     "matchScore": 0.5,
     "terms": [
-        "car",
         "covered parking space",
         "garage",
+        "car",
         "porch"
     ],
     "name": "Carport"
diff --git a/data/presets/presets/building/detached.json b/data/presets/presets/building/detached.json
index 7bc8468bb..43400e013 100644
--- a/data/presets/presets/building/detached.json
+++ b/data/presets/presets/building/detached.json
@@ -7,11 +7,11 @@
         "building": "detached"
     },
     "terms": [
-        "dwelling",
-        "family",
         "home",
+        "single",
+        "family",
         "residence",
-        "single"
+        "dwelling"
     ],
     "matchScore": 0.5,
     "name": "Detached House"
diff --git a/data/presets/presets/building/grandstand.json b/data/presets/presets/building/grandstand.json
index 4e145ad72..e27f052a5 100644
--- a/data/presets/presets/building/grandstand.json
+++ b/data/presets/presets/building/grandstand.json
@@ -7,10 +7,10 @@
         "building": "grandstand"
     },
     "terms": [
-        "bleachers",
+        "tribune",
         "stand",
         "stands",
-        "tribune"
+        "bleachers"
     ],
     "matchScore": 0.5,
     "name": "Grandstand"
diff --git a/data/presets/presets/building/house.json b/data/presets/presets/building/house.json
index 18dfad886..1c4636ab6 100644
--- a/data/presets/presets/building/house.json
+++ b/data/presets/presets/building/house.json
@@ -7,10 +7,10 @@
         "building": "house"
     },
     "terms": [
-        "dwelling",
-        "family",
         "home",
-        "residence"
+        "family",
+        "residence",
+        "dwelling"
     ],
     "matchScore": 0.5,
     "name": "House"
diff --git a/data/presets/presets/building/houseboat.json b/data/presets/presets/building/houseboat.json
index 661199f10..1df3fdf35 100644
--- a/data/presets/presets/building/houseboat.json
+++ b/data/presets/presets/building/houseboat.json
@@ -7,10 +7,10 @@
         "building": "houseboat"
     },
     "terms": [
-        "dwelling",
-        "family",
         "home",
-        "residence"
+        "family",
+        "residence",
+        "dwelling"
     ],
     "matchScore": 0.5,
     "name": "Houseboat"
diff --git a/data/presets/presets/building/school.json b/data/presets/presets/building/school.json
index 83fe8b732..e2607c44c 100644
--- a/data/presets/presets/building/school.json
+++ b/data/presets/presets/building/school.json
@@ -10,8 +10,8 @@
     "terms": [
         "academy",
         "elementary school",
-        "high school",
-        "middle school"
+        "middle school",
+        "high school"
     ],
     "tags": {
         "building": "school"
diff --git a/data/presets/presets/building/semidetached_house.json b/data/presets/presets/building/semidetached_house.json
index 86e639661..2cf3ef061 100644
--- a/data/presets/presets/building/semidetached_house.json
+++ b/data/presets/presets/building/semidetached_house.json
@@ -7,13 +7,13 @@
         "building": "semidetached_house"
     },
     "terms": [
+        "home",
         "double",
         "duplex",
-        "dwelling",
+        "twin",
         "family",
-        "home",
         "residence",
-        "twin"
+        "dwelling"
     ],
     "matchScore": 0.5,
     "name": "Semi-Detached House"
diff --git a/data/presets/presets/building/terrace.json b/data/presets/presets/building/terrace.json
index ab6df99f1..2d47eaee1 100644
--- a/data/presets/presets/building/terrace.json
+++ b/data/presets/presets/building/terrace.json
@@ -7,12 +7,12 @@
         "building": "terrace"
     },
     "terms": [
-        "brownstone",
-        "dwelling",
-        "family",
         "home",
+        "terrace",
+        "brownstone",
+        "family",
         "residence",
-        "terrace"
+        "dwelling"
     ],
     "matchScore": 0.5,
     "name": "Row Houses"
diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
index 441c359d8..1c1b6a935 100644
--- a/data/presets/presets/club.json
+++ b/data/presets/presets/club.json
@@ -11,9 +11,9 @@
     "moreFields": [
         "access_simple",
         "building/levels_building",
+        "height_building",
         "email",
         "fax",
-        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
diff --git a/data/presets/presets/craft/confectionery.json b/data/presets/presets/craft/confectionery.json
index 1ba5bd897..e6b28b896 100644
--- a/data/presets/presets/craft/confectionery.json
+++ b/data/presets/presets/craft/confectionery.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "candy",
-        "sweet"
+        "sweet",
+        "candy"
     ],
     "tags": {
         "craft": "confectionery"
diff --git a/data/presets/presets/craft/distillery.json b/data/presets/presets/craft/distillery.json
index 3ac1dd608..69720cb3d 100644
--- a/data/presets/presets/craft/distillery.json
+++ b/data/presets/presets/craft/distillery.json
@@ -15,8 +15,8 @@
     "terms": [
         "alcohol",
         "beverage",
-        "booze",
         "bourbon",
+        "booze",
         "brandy",
         "gin",
         "hooch",
diff --git a/data/presets/presets/craft/gardener.json b/data/presets/presets/craft/gardener.json
index 830adc229..c2470b0ec 100644
--- a/data/presets/presets/craft/gardener.json
+++ b/data/presets/presets/craft/gardener.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "grounds keeper",
-        "landscaper"
+        "landscaper",
+        "grounds keeper"
     ],
     "tags": {
         "craft": "gardener"
diff --git a/data/presets/presets/craft/hvac.json b/data/presets/presets/craft/hvac.json
index e4741718c..32a0fb6fb 100644
--- a/data/presets/presets/craft/hvac.json
+++ b/data/presets/presets/craft/hvac.json
@@ -5,9 +5,9 @@
         "area"
     ],
     "terms": [
-        "air conditioning",
         "heat*",
-        "vent*"
+        "vent*",
+        "air conditioning"
     ],
     "tags": {
         "craft": "hvac"
diff --git a/data/presets/presets/emergency/ambulance_station.json b/data/presets/presets/emergency/ambulance_station.json
index 47108d621..7d932dba7 100644
--- a/data/presets/presets/emergency/ambulance_station.json
+++ b/data/presets/presets/emergency/ambulance_station.json
@@ -7,10 +7,10 @@
         "address"
     ],
     "moreFields": [
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json
index f3cae15de..f87458ef7 100644
--- a/data/presets/presets/emergency/defibrillator.json
+++ b/data/presets/presets/emergency/defibrillator.json
@@ -15,7 +15,7 @@
     "terms": [
         "AED"
     ],
-    "tags": {
+   "tags": {
         "emergency": "defibrillator"
     },
     "name": "Defibrillator"
diff --git a/data/presets/presets/emergency/fire_hydrant.json b/data/presets/presets/emergency/fire_hydrant.json
index bf133b350..3eaad823e 100644
--- a/data/presets/presets/emergency/fire_hydrant.json
+++ b/data/presets/presets/emergency/fire_hydrant.json
@@ -8,11 +8,11 @@
         "couplings"
     ],
     "moreFields": [
-        "fire_hydrant/diameter",
         "fire_hydrant/pressure",
+        "fire_hydrant/diameter",
         "level",
-        "survey/date",
-        "water_volume"
+        "water_volume",
+        "survey/date"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/emergency/first_aid_kit.json b/data/presets/presets/emergency/first_aid_kit.json
index e5ddc5fa1..d685251fb 100644
--- a/data/presets/presets/emergency/first_aid_kit.json
+++ b/data/presets/presets/emergency/first_aid_kit.json
@@ -20,7 +20,7 @@
         "medic*",
         "medkit"
     ],
-    "tags": {
+   "tags": {
         "emergency": "first_aid_kit"
     },
     "name": "First Aid Kit"
diff --git a/data/presets/presets/emergency/life_ring.json b/data/presets/presets/emergency/life_ring.json
index a4451ee17..ba6fd624a 100644
--- a/data/presets/presets/emergency/life_ring.json
+++ b/data/presets/presets/emergency/life_ring.json
@@ -9,12 +9,12 @@
         "vertex"
     ],
     "terms": [
-        "kisbie ring",
-        "kisby ring",
         "life buoy",
+        "kisby ring",
+        "kisbie ring",
         "perry buoy"
     ],
-    "tags": {
+   "tags": {
         "emergency": "life_ring"
     },
     "name": "Life Ring"
diff --git a/data/presets/presets/emergency/lifeguard.json b/data/presets/presets/emergency/lifeguard.json
index becfd7d3c..e8db4df69 100644
--- a/data/presets/presets/emergency/lifeguard.json
+++ b/data/presets/presets/emergency/lifeguard.json
@@ -5,7 +5,7 @@
         "operator",
         "building_area",
         "opening_hours"
-    ],
+     ],
     "geometry": [
         "point",
         "area"
diff --git a/data/presets/presets/emergency/siren.json b/data/presets/presets/emergency/siren.json
index becaf7f13..90c7fe9a7 100644
--- a/data/presets/presets/emergency/siren.json
+++ b/data/presets/presets/emergency/siren.json
@@ -18,7 +18,7 @@
         "tornado",
         "warning"
     ],
-    "tags": {
+   "tags": {
         "emergency": "siren"
     },
     "name": "Siren"
diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json
index 7b66cc6c7..775a5ff7f 100644
--- a/data/presets/presets/emergency/water_tank.json
+++ b/data/presets/presets/emergency/water_tank.json
@@ -10,9 +10,9 @@
         "vertex"
     ],
     "terms": [
+        "water tank",
         "cistern",
-        "reservoir",
-        "water tank"
+        "reservoir"
     ],
     "tags": {
         "emergency": "water_tank"
diff --git a/data/presets/presets/entrance.json b/data/presets/presets/entrance.json
index 9bbe8ee1e..51951e4f3 100644
--- a/data/presets/presets/entrance.json
+++ b/data/presets/presets/entrance.json
@@ -4,9 +4,9 @@
         "vertex"
     ],
     "terms": [
-        "door",
         "entrance",
-        "exit"
+        "exit",
+        "door"
     ],
     "tags": {
         "entrance": "*"
diff --git a/data/presets/presets/golf/bunker.json b/data/presets/presets/golf/bunker.json
index 636973bdd..6528c5f67 100644
--- a/data/presets/presets/golf/bunker.json
+++ b/data/presets/presets/golf/bunker.json
@@ -14,8 +14,8 @@
         "natural": "sand"
     },
     "terms": [
-        "bunker",
-        "hazard"
+        "hazard",
+        "bunker"
     ],
     "name": "Sand Trap"
 }
diff --git a/data/presets/presets/healthcare.json b/data/presets/presets/healthcare.json
index 3acad473c..7135abde0 100644
--- a/data/presets/presets/healthcare.json
+++ b/data/presets/presets/healthcare.json
@@ -9,16 +9,16 @@
         "building_area"
     ],
     "moreFields": [
-        "brand",
         "building/levels_building",
-        "email",
-        "fax",
         "height_building",
-        "level",
         "opening_hours",
         "payment_multi",
-        "phone",
+        "brand",
         "website",
+        "phone",
+        "email",
+        "fax",
+        "level",
         "wheelchair"
     ],
     "geometry": [
@@ -30,8 +30,8 @@
     },
     "terms": [
         "clinic",
-        "disease",
         "doctor",
+        "disease",
         "health",
         "institution",
         "sick",
diff --git a/data/presets/presets/healthcare/birthing_center.json b/data/presets/presets/healthcare/birthing_center.json
index edc81a4da..b6687eea2 100644
--- a/data/presets/presets/healthcare/birthing_center.json
+++ b/data/presets/presets/healthcare/birthing_center.json
@@ -8,8 +8,8 @@
         "baby",
         "childbirth",
         "delivery",
-        "labor",
         "labour",
+        "labor",
         "pregnancy"
     ],
     "tags": {
diff --git a/data/presets/presets/healthcare/blood_donation.json b/data/presets/presets/healthcare/blood_donation.json
index 516a1a54e..b7bbe2f79 100644
--- a/data/presets/presets/healthcare/blood_donation.json
+++ b/data/presets/presets/healthcare/blood_donation.json
@@ -9,10 +9,10 @@
         "area"
     ],
     "terms": [
-        "apheresis",
         "blood bank",
         "blood donation",
         "blood transfusion",
+        "apheresis",
         "plasmapheresis",
         "plateletpheresis",
         "stem cell donation"
diff --git a/data/presets/presets/healthcare/hospice.json b/data/presets/presets/healthcare/hospice.json
index 23a5aec18..e7cbbbd34 100644
--- a/data/presets/presets/healthcare/hospice.json
+++ b/data/presets/presets/healthcare/hospice.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "illness",
-        "terminal"
+        "terminal",
+        "illness"
     ],
     "tags": {
         "healthcare": "hospice"
diff --git a/data/presets/presets/healthcare/laboratory.json b/data/presets/presets/healthcare/laboratory.json
index 5d0f54b3b..48b4821f6 100644
--- a/data/presets/presets/healthcare/laboratory.json
+++ b/data/presets/presets/healthcare/laboratory.json
@@ -13,9 +13,9 @@
         "area"
     ],
     "terms": [
-        "blood_check",
+        "medical_laboratory",
         "medical_lab",
-        "medical_laboratory"
+        "blood_check"
     ],
     "tags": {
         "healthcare": "laboratory"
diff --git a/data/presets/presets/healthcare/midwife.json b/data/presets/presets/healthcare/midwife.json
index da1a1c9a2..f9074c15f 100644
--- a/data/presets/presets/healthcare/midwife.json
+++ b/data/presets/presets/healthcare/midwife.json
@@ -8,8 +8,8 @@
         "baby",
         "childbirth",
         "delivery",
-        "labor",
         "labour",
+        "labor",
         "pregnancy"
     ],
     "tags": {
diff --git a/data/presets/presets/healthcare/podiatrist.json b/data/presets/presets/healthcare/podiatrist.json
index cb6ab60d1..ebd282fc1 100644
--- a/data/presets/presets/healthcare/podiatrist.json
+++ b/data/presets/presets/healthcare/podiatrist.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "feet",
         "foot",
+        "feet",
         "nails"
     ],
     "tags": {
diff --git a/data/presets/presets/highway/crossing/_zebra-raised.json b/data/presets/presets/highway/crossing/_zebra-raised.json
index 7ef138533..bef4b725f 100644
--- a/data/presets/presets/highway/crossing/_zebra-raised.json
+++ b/data/presets/presets/highway/crossing/_zebra-raised.json
@@ -18,13 +18,13 @@
         "value": "table"
     },
     "terms": [
+        "zebra crossing",
+        "marked crossing",
         "crosswalk",
         "flat top",
         "hump",
-        "marked crossing",
-        "slow",
         "speed",
-        "zebra crossing"
+        "slow"
     ],
     "name": "Marked Crosswalk (Raised)",
     "searchable": false
diff --git a/data/presets/presets/highway/crossing/_zebra.json b/data/presets/presets/highway/crossing/_zebra.json
index 06f4093db..a18c381c7 100644
--- a/data/presets/presets/highway/crossing/_zebra.json
+++ b/data/presets/presets/highway/crossing/_zebra.json
@@ -17,9 +17,9 @@
         "value": "crossing"
     },
     "terms": [
-        "crosswalk",
+        "zebra crossing",
         "marked crossing",
-        "zebra crossing"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk",
     "searchable": false
diff --git a/data/presets/presets/highway/crossing/marked-raised.json b/data/presets/presets/highway/crossing/marked-raised.json
index 512712c47..a2d00e302 100644
--- a/data/presets/presets/highway/crossing/marked-raised.json
+++ b/data/presets/presets/highway/crossing/marked-raised.json
@@ -23,13 +23,13 @@
         "value": "table"
     },
     "terms": [
+        "zebra crossing",
+        "marked crossing",
         "crosswalk",
         "flat top",
         "hump",
-        "marked crossing",
-        "slow",
         "speed",
-        "zebra crossing"
+        "slow"
     ],
     "name": "Marked Crosswalk (Raised)"
 }
diff --git a/data/presets/presets/highway/crossing/marked.json b/data/presets/presets/highway/crossing/marked.json
index 0471e40e4..f601fd800 100644
--- a/data/presets/presets/highway/crossing/marked.json
+++ b/data/presets/presets/highway/crossing/marked.json
@@ -21,9 +21,9 @@
         "value": "crossing"
     },
     "terms": [
-        "crosswalk",
+        "zebra crossing",
         "marked crossing",
-        "zebra crossing"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk"
 }
diff --git a/data/presets/presets/highway/crossing/unmarked-raised.json b/data/presets/presets/highway/crossing/unmarked-raised.json
index 6bc843b88..fff5477f1 100644
--- a/data/presets/presets/highway/crossing/unmarked-raised.json
+++ b/data/presets/presets/highway/crossing/unmarked-raised.json
@@ -20,8 +20,8 @@
     "terms": [
         "flat top",
         "hump",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "name": "Unmarked Crossing (Raised)"
 }
diff --git a/data/presets/presets/highway/cycleway/bicycle_foot.json b/data/presets/presets/highway/cycleway/bicycle_foot.json
index 4e78f421d..5c7bff83c 100644
--- a/data/presets/presets/highway/cycleway/bicycle_foot.json
+++ b/data/presets/presets/highway/cycleway/bicycle_foot.json
@@ -22,8 +22,8 @@
         "greenway",
         "mixed-use trail",
         "multi-use trail",
-        "rail trail",
-        "segregated trail"
+        "segregated trail",
+        "rail trail"
     ],
     "matchScore": 0.95,
     "name": "Cycle & Foot Path"
diff --git a/data/presets/presets/highway/cycleway/crossing/marked.json b/data/presets/presets/highway/cycleway/crossing/marked.json
index 233fc46e5..dd1b98317 100644
--- a/data/presets/presets/highway/cycleway/crossing/marked.json
+++ b/data/presets/presets/highway/cycleway/crossing/marked.json
@@ -24,11 +24,11 @@
         "value": "crossing"
     },
     "terms": [
-        "bicycle crossing",
-        "bike crossing",
         "cycle crosswalk",
         "cycle path crossing",
-        "cycleway crossing"
+        "cycleway crossing",
+        "bicycle crossing",
+        "bike crossing"
     ],
     "name": "Marked Cycle Crossing"
 }
diff --git a/data/presets/presets/highway/cycleway/crossing/unmarked.json b/data/presets/presets/highway/cycleway/crossing/unmarked.json
index bb92cbe85..44289605e 100644
--- a/data/presets/presets/highway/cycleway/crossing/unmarked.json
+++ b/data/presets/presets/highway/cycleway/crossing/unmarked.json
@@ -24,10 +24,10 @@
         "value": "crossing"
     },
     "terms": [
-        "bicycle crossing",
-        "bike crossing",
         "cycle path crossing",
-        "cycleway crossing"
+        "cycleway crossing",
+        "bicycle crossing",
+        "bike crossing"
     ],
     "name": "Unmarked Cycle Crossing"
 }
diff --git a/data/presets/presets/highway/emergency_bay.json b/data/presets/presets/highway/emergency_bay.json
index bbb109cee..65598e82c 100644
--- a/data/presets/presets/highway/emergency_bay.json
+++ b/data/presets/presets/highway/emergency_bay.json
@@ -1,8 +1,6 @@
 {
     "icon": "maki-car",
-    "geometry": [
-        "vertex"
-    ],
+    "geometry": [ "vertex" ],
     "tags": {
         "highway": "emergency_bay"
     },
diff --git a/data/presets/presets/highway/footway/_zebra-raised.json b/data/presets/presets/highway/footway/_zebra-raised.json
index 8abd8b5e5..d981e4790 100644
--- a/data/presets/presets/highway/footway/_zebra-raised.json
+++ b/data/presets/presets/highway/footway/_zebra-raised.json
@@ -21,13 +21,13 @@
         "value": "table"
     },
     "terms": [
+        "zebra crossing",
+        "marked crossing",
         "crosswalk",
         "flat top",
         "hump",
-        "marked crossing",
-        "slow",
         "speed",
-        "zebra crossing"
+        "slow"
     ],
     "name": "Marked Crosswalk (Raised)",
     "searchable": false
diff --git a/data/presets/presets/highway/footway/_zebra.json b/data/presets/presets/highway/footway/_zebra.json
index d7b5b5461..2ff0ae067 100644
--- a/data/presets/presets/highway/footway/_zebra.json
+++ b/data/presets/presets/highway/footway/_zebra.json
@@ -20,9 +20,9 @@
         "value": "crossing"
     },
     "terms": [
-        "crosswalk",
+        "zebra crossing",
         "marked crossing",
-        "zebra crossing"
+        "crosswalk"
     ],
     "name": "Marked Crosswalk",
     "searchable": false
diff --git a/data/presets/presets/highway/footway/conveying.json b/data/presets/presets/highway/footway/conveying.json
index edc1c01e0..01d92297e 100644
--- a/data/presets/presets/highway/footway/conveying.json
+++ b/data/presets/presets/highway/footway/conveying.json
@@ -12,13 +12,13 @@
         "line"
     ],
     "terms": [
-        "autwalk",
-        "conveyor",
         "moving sidewalk",
+        "autwalk",
         "skywalk",
+        "travolator",
         "travelator",
         "travellator",
-        "travolator"
+        "conveyor"
     ],
     "tags": {
         "highway": "footway",
diff --git a/data/presets/presets/highway/footway/marked-raised.json b/data/presets/presets/highway/footway/marked-raised.json
index 177944cae..d21fb2fd9 100644
--- a/data/presets/presets/highway/footway/marked-raised.json
+++ b/data/presets/presets/highway/footway/marked-raised.json
@@ -26,13 +26,13 @@
         "value": "table"
     },
     "terms": [
+        "zebra crossing",
+        "marked crossing",
         "crosswalk",
         "flat top",
         "hump",
-        "marked crossing",
-        "slow",
         "speed",
-        "zebra crossing"
+        "slow"
     ],
     "name": "Marked Crosswalk (Raised)"
 }
diff --git a/data/presets/presets/highway/footway/marked.json b/data/presets/presets/highway/footway/marked.json
index c2987af70..e0f171c6d 100644
--- a/data/presets/presets/highway/footway/marked.json
+++ b/data/presets/presets/highway/footway/marked.json
@@ -24,8 +24,8 @@
         "value": "crossing"
     },
     "terms": [
-        "marked crossing",
         "marked foot path crossing",
+        "marked crossing",
         "marked pedestrian crosswalk",
         "zebra crossing"
     ],
diff --git a/data/presets/presets/highway/footway/unmarked-raised.json b/data/presets/presets/highway/footway/unmarked-raised.json
index 60fa1481c..4120e091a 100644
--- a/data/presets/presets/highway/footway/unmarked-raised.json
+++ b/data/presets/presets/highway/footway/unmarked-raised.json
@@ -28,8 +28,8 @@
     "terms": [
         "flat top",
         "hump",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "name": "Unmarked Crossing (Raised)"
 }
diff --git a/data/presets/presets/highway/footway/unmarked.json b/data/presets/presets/highway/footway/unmarked.json
index c66f5e050..4dfeb586e 100644
--- a/data/presets/presets/highway/footway/unmarked.json
+++ b/data/presets/presets/highway/footway/unmarked.json
@@ -24,8 +24,8 @@
         "value": "crossing"
     },
     "terms": [
-        "unmarked crosswalk",
         "unmarked foot path crossing",
+        "unmarked crosswalk",
         "unmarked pedestrian crossing"
     ],
     "name": "Unmarked Crossing"
diff --git a/data/presets/presets/highway/give_way.json b/data/presets/presets/highway/give_way.json
index eb0a528ab..5716e0dee 100644
--- a/data/presets/presets/highway/give_way.json
+++ b/data/presets/presets/highway/give_way.json
@@ -11,8 +11,8 @@
     },
     "terms": [
         "give way",
-        "sign",
-        "yield"
+        "yield",
+        "sign"
     ],
     "name": "Yield Sign"
 }
diff --git a/data/presets/presets/highway/motorway_link.json b/data/presets/presets/highway/motorway_link.json
index 6c393df3b..8060b87c2 100644
--- a/data/presets/presets/highway/motorway_link.json
+++ b/data/presets/presets/highway/motorway_link.json
@@ -38,11 +38,11 @@
     },
     "terms": [
         "exit",
-        "off ramp",
-        "on ramp",
         "ramp",
         "road",
-        "street"
+        "street",
+        "on ramp",
+        "off ramp"
     ],
     "name": "Motorway Link"
 }
diff --git a/data/presets/presets/highway/path.json b/data/presets/presets/highway/path.json
index 96d4a7924..a800289fd 100644
--- a/data/presets/presets/highway/path.json
+++ b/data/presets/presets/highway/path.json
@@ -16,8 +16,8 @@
         "lit",
         "maxweight_bridge",
         "mtb/scale",
-        "mtb/scale/imba",
         "mtb/scale/uphill",
+        "mtb/scale/imba",
         "not/name",
         "ref",
         "sac_scale",
diff --git a/data/presets/presets/highway/path/informal.json b/data/presets/presets/highway/path/informal.json
index a4efc554d..6fc7e95b7 100644
--- a/data/presets/presets/highway/path/informal.json
+++ b/data/presets/presets/highway/path/informal.json
@@ -16,8 +16,8 @@
         "lit",
         "maxweight_bridge",
         "mtb/scale",
-        "mtb/scale/imba",
         "mtb/scale/uphill",
+        "mtb/scale/imba",
         "sac_scale",
         "stroller",
         "structure",
diff --git a/data/presets/presets/highway/primary_link.json b/data/presets/presets/highway/primary_link.json
index 982179e9a..c6405e97b 100644
--- a/data/presets/presets/highway/primary_link.json
+++ b/data/presets/presets/highway/primary_link.json
@@ -17,8 +17,8 @@
         "destination/symbol_oneway",
         "flood_prone",
         "incline",
-        "junction_line",
         "junction/ref_oneway",
+        "junction_line",
         "lit",
         "maxheight",
         "maxspeed/advisory",
@@ -37,8 +37,8 @@
         "highway": "primary_link"
     },
     "terms": [
-        "off ramp",
         "on ramp",
+        "off ramp",
         "ramp",
         "road",
         "street"
diff --git a/data/presets/presets/highway/raceway/motocross.json b/data/presets/presets/highway/raceway/motocross.json
index ef9dfe3fd..70a4b171b 100644
--- a/data/presets/presets/highway/raceway/motocross.json
+++ b/data/presets/presets/highway/raceway/motocross.json
@@ -9,11 +9,11 @@
         "sport": "motocross"
     },
     "terms": [
+        "off-road racing",
+        "offroad moto racing",
         "motocross circuit",
         "motorcycle track",
-        "motorsports",
-        "off-road racing",
-        "offroad moto racing"
+        "motorsports"
     ],
     "name": "Motocross Racetrack"
 }
diff --git a/data/presets/presets/highway/residential.json b/data/presets/presets/highway/residential.json
index 2fdc3c5c0..b121d06fc 100644
--- a/data/presets/presets/highway/residential.json
+++ b/data/presets/presets/highway/residential.json
@@ -16,11 +16,11 @@
         "incline",
         "junction_line",
         "lit",
+        "oneway/bicycle",
         "maxheight",
         "maxspeed/advisory",
         "maxweight_bridge",
         "not/name",
-        "oneway/bicycle",
         "smoothness",
         "trolley_wire"
     ],
diff --git a/data/presets/presets/highway/rest_area.json b/data/presets/presets/highway/rest_area.json
index 1a694f0c4..d6e7f3be6 100644
--- a/data/presets/presets/highway/rest_area.json
+++ b/data/presets/presets/highway/rest_area.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/highway/secondary_link.json b/data/presets/presets/highway/secondary_link.json
index f4526f3ed..8275ac081 100644
--- a/data/presets/presets/highway/secondary_link.json
+++ b/data/presets/presets/highway/secondary_link.json
@@ -13,8 +13,8 @@
         "highway": "secondary_link"
     },
     "terms": [
-        "off ramp",
         "on ramp",
+        "off ramp",
         "ramp",
         "road",
         "street"
diff --git a/data/presets/presets/highway/services.json b/data/presets/presets/highway/services.json
index 720688e00..0893cda0a 100644
--- a/data/presets/presets/highway/services.json
+++ b/data/presets/presets/highway/services.json
@@ -15,9 +15,9 @@
         "highway": "services"
     },
     "terms": [
-        "service station",
         "services",
-        "travel plaza"
+        "travel plaza",
+        "service station"
     ],
     "name": "Service Area"
 }
diff --git a/data/presets/presets/highway/speed_camera.json b/data/presets/presets/highway/speed_camera.json
index f2d08621f..81e5fe78b 100644
--- a/data/presets/presets/highway/speed_camera.json
+++ b/data/presets/presets/highway/speed_camera.json
@@ -8,10 +8,11 @@
         "direction",
         "ref",
         "maxspeed"
-    ],
+     ],
     "tags": {
         "highway": "speed_camera"
     },
-    "terms": [],
+    "terms": [
+    ],
     "name": "Speed Camera"
 }
diff --git a/data/presets/presets/highway/steps.json b/data/presets/presets/highway/steps.json
index 3c9a825bd..33f09e587 100644
--- a/data/presets/presets/highway/steps.json
+++ b/data/presets/presets/highway/steps.json
@@ -26,8 +26,8 @@
         "highway": "steps"
     },
     "terms": [
-        "staircase",
         "stairs",
+        "staircase",
         "stairway"
     ],
     "name": "Steps"
diff --git a/data/presets/presets/highway/stop.json b/data/presets/presets/highway/stop.json
index 926ba7815..c8eaa6195 100644
--- a/data/presets/presets/highway/stop.json
+++ b/data/presets/presets/highway/stop.json
@@ -11,9 +11,9 @@
         "highway": "stop"
     },
     "terms": [
+        "stop",
         "halt",
-        "sign",
-        "stop"
+        "sign"
     ],
     "name": "Stop Sign"
 }
diff --git a/data/presets/presets/highway/street_lamp.json b/data/presets/presets/highway/street_lamp.json
index 07264b624..e6c50d362 100644
--- a/data/presets/presets/highway/street_lamp.json
+++ b/data/presets/presets/highway/street_lamp.json
@@ -13,11 +13,11 @@
         "ref"
     ],
     "terms": [
-        "gaslight",
+        "streetlight",
+        "street light",
         "lamp",
         "light",
-        "street light",
-        "streetlight"
+        "gaslight"
     ],
     "name": "Street Lamp"
 }
diff --git a/data/presets/presets/highway/tertiary_link.json b/data/presets/presets/highway/tertiary_link.json
index fb28d477a..443cdff78 100644
--- a/data/presets/presets/highway/tertiary_link.json
+++ b/data/presets/presets/highway/tertiary_link.json
@@ -13,8 +13,8 @@
         "highway": "tertiary_link"
     },
     "terms": [
-        "off ramp",
         "on ramp",
+        "off ramp",
         "ramp",
         "road",
         "street"
diff --git a/data/presets/presets/highway/track.json b/data/presets/presets/highway/track.json
index 232858ce6..e80e01441 100644
--- a/data/presets/presets/highway/track.json
+++ b/data/presets/presets/highway/track.json
@@ -16,8 +16,8 @@
         "horse_scale",
         "maxweight_bridge",
         "mtb/scale",
-        "mtb/scale/imba",
         "mtb/scale/uphill",
+        "mtb/scale/imba",
         "stroller",
         "wheelchair"
     ],
@@ -28,26 +28,26 @@
         "highway": "track"
     },
     "terms": [
+        "woods road",
+        "forest road",
+        "logging road",
+        "fire road",
+        "farm road",
+        "agricultural road",
+        "ranch road",
+        "carriage road",
+        "primitive",
+        "unmaintained",
+        "rut",
+        "offroad",
         "4wd",
         "4x4",
-        "agricultural road",
-        "atv",
-        "carriage road",
-        "double track",
-        "farm road",
-        "fire road",
-        "forest road",
         "four wheel drive",
-        "jeep",
-        "logging road",
-        "offroad",
-        "primitive",
+        "atv",
         "quad",
-        "ranch road",
-        "rut",
-        "two track",
-        "unmaintained",
-        "woods road"
+        "jeep",
+        "double track",
+        "two track"
     ],
     "name": "Unmaintained Track Road"
 }
diff --git a/data/presets/presets/highway/traffic_mirror.json b/data/presets/presets/highway/traffic_mirror.json
index 45ab4a276..06c9ef1ce 100644
--- a/data/presets/presets/highway/traffic_mirror.json
+++ b/data/presets/presets/highway/traffic_mirror.json
@@ -6,7 +6,7 @@
     ],
     "fields": [
         "direction"
-    ],
+     ],
     "tags": {
         "highway": "traffic_mirror"
     },
diff --git a/data/presets/presets/highway/trailhead.json b/data/presets/presets/highway/trailhead.json
index 294f6d4d5..281d46bc3 100644
--- a/data/presets/presets/highway/trailhead.json
+++ b/data/presets/presets/highway/trailhead.json
@@ -24,9 +24,9 @@
         "mile zero",
         "mountain biking",
         "mountaineering",
-        "staging area",
         "trail endpoint",
         "trail start",
+        "staging area",
         "trekking"
     ],
     "name": "Trailhead"
diff --git a/data/presets/presets/highway/trunk.json b/data/presets/presets/highway/trunk.json
index 3b7d314c7..9a3d67cff 100644
--- a/data/presets/presets/highway/trunk.json
+++ b/data/presets/presets/highway/trunk.json
@@ -17,8 +17,8 @@
         "junction_line",
         "lit",
         "maxheight",
-        "maxweight_bridge",
         "minspeed",
+        "maxweight_bridge",
         "not/name",
         "smoothness",
         "toll"
diff --git a/data/presets/presets/highway/trunk_link.json b/data/presets/presets/highway/trunk_link.json
index c4d5e8838..2d92817e3 100644
--- a/data/presets/presets/highway/trunk_link.json
+++ b/data/presets/presets/highway/trunk_link.json
@@ -13,8 +13,8 @@
         "highway": "trunk_link"
     },
     "terms": [
-        "off ramp",
         "on ramp",
+        "off ramp",
         "ramp",
         "road",
         "street"
diff --git a/data/presets/presets/historic/castle/palace.json b/data/presets/presets/historic/castle/palace.json
index 068325852..6244055a0 100644
--- a/data/presets/presets/historic/castle/palace.json
+++ b/data/presets/presets/historic/castle/palace.json
@@ -19,10 +19,10 @@
         "castle_type": "palace"
     },
     "terms": [
-        "king",
-        "queen",
+        "Royal Residence",
         "royal",
-        "Royal Residence"
+        "king",
+        "queen"
     ],
     "name": "Palace"
 }
diff --git a/data/presets/presets/historic/castle/stately.json b/data/presets/presets/historic/castle/stately.json
index ec9d33527..08aee47c7 100644
--- a/data/presets/presets/historic/castle/stately.json
+++ b/data/presets/presets/historic/castle/stately.json
@@ -19,11 +19,11 @@
         "castle_type": "stately"
     },
     "terms": [
-        "gentry",
         "Historic Country House",
+        "Stately Home",
         "nobility",
-        "representative",
-        "Stately Home"
+        "gentry",
+        "representative"
     ],
     "name": "Château"
 }
diff --git a/data/presets/presets/historic/manor.json b/data/presets/presets/historic/manor.json
index 6559fee21..6c07fc6e8 100644
--- a/data/presets/presets/historic/manor.json
+++ b/data/presets/presets/historic/manor.json
@@ -14,10 +14,10 @@
         "historic": "manor"
     },
     "terms": [
-        "estate",
-        "gentry",
         "Mansion",
-        "nobility"
+        "gentry",
+        "nobility",
+        "estate"
     ],
     "name": "Manor House"
 }
diff --git a/data/presets/presets/historic/memorial.json b/data/presets/presets/historic/memorial.json
index 2072a1450..c8258e472 100644
--- a/data/presets/presets/historic/memorial.json
+++ b/data/presets/presets/historic/memorial.json
@@ -17,10 +17,10 @@
     "terms": [
         "dedicatory",
         "epitaph",
-        "memory",
-        "monument",
         "remember",
         "remembrance",
+        "memory",
+        "monument",
         "stolperstein"
     ],
     "tags": {
diff --git a/data/presets/presets/historic/memorial/plaque.json b/data/presets/presets/historic/memorial/plaque.json
index bc3307a3f..49bb3f6de 100644
--- a/data/presets/presets/historic/memorial/plaque.json
+++ b/data/presets/presets/historic/memorial/plaque.json
@@ -12,9 +12,9 @@
         "dedicatory",
         "epitaph",
         "historical marker",
-        "memory",
         "remember",
-        "remembrance"
+        "remembrance",
+        "memory"
     ],
     "tags": {
         "historic": "memorial",
diff --git a/data/presets/presets/historic/wreck.json b/data/presets/presets/historic/wreck.json
index c87191516..3c624455f 100644
--- a/data/presets/presets/historic/wreck.json
+++ b/data/presets/presets/historic/wreck.json
@@ -19,16 +19,16 @@
         "historic": "wreck"
     },
     "addTags": {
-        "historic": "wreck",
+    	"historic": "wreck",
         "seamark:type": "wreck"
     },
     "terms": [
-        "boat",
         "hull",
-        "maritime",
         "mast",
+        "maritime",
         "remains",
-        "ship"
+        "ship",
+        "boat"
     ],
     "name": "Shipwreck"
 }
diff --git a/data/presets/presets/indoor/elevator.json b/data/presets/presets/indoor/elevator.json
index c2c0a710f..56f7c6723 100644
--- a/data/presets/presets/indoor/elevator.json
+++ b/data/presets/presets/indoor/elevator.json
@@ -1,5 +1,5 @@
 {
-    "icon": "temaki-elevator",
+    "icon":"temaki-elevator",
     "fields": [
         "ref",
         "level_semi"
diff --git a/data/presets/presets/indoor/stairs.json b/data/presets/presets/indoor/stairs.json
index dc46ee7c5..c3e210554 100644
--- a/data/presets/presets/indoor/stairs.json
+++ b/data/presets/presets/indoor/stairs.json
@@ -14,8 +14,8 @@
     },
     "terms": [
         "stair",
-        "staircase",
         "stairs",
+        "staircase",
         "stairway",
         "stairwell",
         "steps"
diff --git a/data/presets/presets/internet_access/wlan.json b/data/presets/presets/internet_access/wlan.json
index fca74e71c..966329b3d 100644
--- a/data/presets/presets/internet_access/wlan.json
+++ b/data/presets/presets/internet_access/wlan.json
@@ -12,9 +12,9 @@
         "level"
     ],
     "terms": [
-        "hotspot",
         "wi-fi",
-        "wifi"
+        "wifi",
+        "hotspot"
     ],
     "tags": {
         "internet_access": "wlan"
diff --git a/data/presets/presets/landuse/allotments.json b/data/presets/presets/landuse/allotments.json
index f2e07f04d..abe1e91ce 100644
--- a/data/presets/presets/landuse/allotments.json
+++ b/data/presets/presets/landuse/allotments.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "allotments"
diff --git a/data/presets/presets/landuse/aquaculture.json b/data/presets/presets/landuse/aquaculture.json
index 158397f1f..4900c997c 100644
--- a/data/presets/presets/landuse/aquaculture.json
+++ b/data/presets/presets/landuse/aquaculture.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
@@ -19,14 +19,14 @@
         "landuse": "aquaculture"
     },
     "terms": [
-        "algaculture",
+        "fish farm",
+        "crustacean",
         "algae",
         "aquafarming",
-        "crustacean",
-        "fish farm",
-        "mariculture",
+        "shrimp farm",
         "oyster farm",
-        "shrimp farm"
+        "mariculture",
+        "algaculture"
     ],
     "name": "Aquaculture"
 }
diff --git a/data/presets/presets/landuse/cemetery.json b/data/presets/presets/landuse/cemetery.json
index b0c457498..bb447fb9a 100644
--- a/data/presets/presets/landuse/cemetery.json
+++ b/data/presets/presets/landuse/cemetery.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/churchyard.json b/data/presets/presets/landuse/churchyard.json
index 1341d70e3..fac0bf0af 100644
--- a/data/presets/presets/landuse/churchyard.json
+++ b/data/presets/presets/landuse/churchyard.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/commercial.json b/data/presets/presets/landuse/commercial.json
index 7d12a5ea6..cb1a1724b 100644
--- a/data/presets/presets/landuse/commercial.json
+++ b/data/presets/presets/landuse/commercial.json
@@ -5,10 +5,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/construction.json b/data/presets/presets/landuse/construction.json
index d0ee5af31..52b68447a 100644
--- a/data/presets/presets/landuse/construction.json
+++ b/data/presets/presets/landuse/construction.json
@@ -10,10 +10,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json
index b4431b9b5..730a46e22 100644
--- a/data/presets/presets/landuse/farmland.json
+++ b/data/presets/presets/landuse/farmland.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index 0e72cafb0..13641d2d2 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index 9d5173723..567a442bf 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/garages.json b/data/presets/presets/landuse/garages.json
index e1cd1cd0a..04fa226ac 100644
--- a/data/presets/presets/landuse/garages.json
+++ b/data/presets/presets/landuse/garages.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "garages"
diff --git a/data/presets/presets/landuse/greenhouse_horticulture.json b/data/presets/presets/landuse/greenhouse_horticulture.json
index 04ac5722f..ba49e9209 100644
--- a/data/presets/presets/landuse/greenhouse_horticulture.json
+++ b/data/presets/presets/landuse/greenhouse_horticulture.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
@@ -17,8 +17,8 @@
     "terms": [
         "flower",
         "greenhouse",
-        "grow",
         "horticulture",
+        "grow",
         "vivero"
     ],
     "tags": {
diff --git a/data/presets/presets/landuse/harbour.json b/data/presets/presets/landuse/harbour.json
index 969c64b3e..24e820f1d 100644
--- a/data/presets/presets/landuse/harbour.json
+++ b/data/presets/presets/landuse/harbour.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/industrial.json b/data/presets/presets/landuse/industrial.json
index 85cfdf8e8..f65a0bd09 100644
--- a/data/presets/presets/landuse/industrial.json
+++ b/data/presets/presets/landuse/industrial.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/landfill.json b/data/presets/presets/landuse/landfill.json
index b8cbe8006..ff867219b 100644
--- a/data/presets/presets/landuse/landfill.json
+++ b/data/presets/presets/landuse/landfill.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "landfill"
diff --git a/data/presets/presets/landuse/military.json b/data/presets/presets/landuse/military.json
index c0f878012..90d4025da 100644
--- a/data/presets/presets/landuse/military.json
+++ b/data/presets/presets/landuse/military.json
@@ -5,10 +5,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/military/danger_area.json b/data/presets/presets/landuse/military/danger_area.json
index c7926c503..9386d5061 100644
--- a/data/presets/presets/landuse/military/danger_area.json
+++ b/data/presets/presets/landuse/military/danger_area.json
@@ -24,8 +24,8 @@
         "explo*",
         "force",
         "guard",
-        "marine",
         "mine",
+        "marine",
         "navy",
         "troop",
         "war"
diff --git a/data/presets/presets/landuse/plant_nursery.json b/data/presets/presets/landuse/plant_nursery.json
index 27e6d0b91..1b3d5d806 100644
--- a/data/presets/presets/landuse/plant_nursery.json
+++ b/data/presets/presets/landuse/plant_nursery.json
@@ -7,10 +7,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/quarry.json b/data/presets/presets/landuse/quarry.json
index 7581d6723..f037975de 100644
--- a/data/presets/presets/landuse/quarry.json
+++ b/data/presets/presets/landuse/quarry.json
@@ -9,10 +9,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "quarry"
diff --git a/data/presets/presets/landuse/railway.json b/data/presets/presets/landuse/railway.json
index 94c680a51..9566edfe1 100644
--- a/data/presets/presets/landuse/railway.json
+++ b/data/presets/presets/landuse/railway.json
@@ -11,8 +11,8 @@
     },
     "terms": [
         "rail",
-        "track",
-        "train"
+        "train",
+        "track"
     ],
     "name": "Railway Corridor"
 }
diff --git a/data/presets/presets/landuse/recreation_ground.json b/data/presets/presets/landuse/recreation_ground.json
index f70675ac2..a92533df9 100644
--- a/data/presets/presets/landuse/recreation_ground.json
+++ b/data/presets/presets/landuse/recreation_ground.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "recreation_ground"
diff --git a/data/presets/presets/landuse/religious.json b/data/presets/presets/landuse/religious.json
index 937829569..e136b970f 100644
--- a/data/presets/presets/landuse/religious.json
+++ b/data/presets/presets/landuse/religious.json
@@ -10,10 +10,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "religious"
diff --git a/data/presets/presets/landuse/retail.json b/data/presets/presets/landuse/retail.json
index 946e49956..49ccf270a 100644
--- a/data/presets/presets/landuse/retail.json
+++ b/data/presets/presets/landuse/retail.json
@@ -8,10 +8,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "landuse": "retail"
diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json
index f417f11e4..f57194155 100644
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -6,10 +6,10 @@
     ],
     "moreFields": [
         "address",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "area"
diff --git a/data/presets/presets/landuse/winter_sports.json b/data/presets/presets/landuse/winter_sports.json
index 7d621758a..5267adc1d 100644
--- a/data/presets/presets/landuse/winter_sports.json
+++ b/data/presets/presets/landuse/winter_sports.json
@@ -8,8 +8,8 @@
         "operator"
     ],
     "moreFields": [
-        "access_simple",
         "address",
+        "access_simple",
         "opening_hours"
     ],
     "tags": {
diff --git a/data/presets/presets/leisure/amusement_arcade.json b/data/presets/presets/leisure/amusement_arcade.json
index 13e8f9353..f4e77ec15 100644
--- a/data/presets/presets/leisure/amusement_arcade.json
+++ b/data/presets/presets/leisure/amusement_arcade.json
@@ -25,10 +25,10 @@
         "area"
     ],
     "terms": [
-        "driving simulators",
         "pay-to-play games",
-        "pinball machines",
-        "video games"
+        "video games",
+        "driving simulators",
+        "pinball machines"
     ],
     "tags": {
         "leisure": "amusement_arcade"
diff --git a/data/presets/presets/leisure/beach_resort.json b/data/presets/presets/leisure/beach_resort.json
index 2470a6cf2..704b8b369 100644
--- a/data/presets/presets/leisure/beach_resort.json
+++ b/data/presets/presets/leisure/beach_resort.json
@@ -9,11 +9,11 @@
         "charge_fee"
     ],
     "moreFields": [
-        "email",
-        "fax",
-        "phone",
         "smoking",
-        "website"
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/bird_hide.json b/data/presets/presets/leisure/bird_hide.json
index 9970aeeea..7f08dc038 100644
--- a/data/presets/presets/leisure/bird_hide.json
+++ b/data/presets/presets/leisure/bird_hide.json
@@ -7,7 +7,7 @@
         "opening_hours"
     ],
     "moreFields": [
-        "website"
+        "website" 
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/bleachers.json b/data/presets/presets/leisure/bleachers.json
index 069465026..1faa3e8e1 100644
--- a/data/presets/presets/leisure/bleachers.json
+++ b/data/presets/presets/leisure/bleachers.json
@@ -7,13 +7,13 @@
         "leisure": "bleachers"
     },
     "terms": [
-        "bench",
         "crowd",
-        "seat",
-        "seating",
+        "bench",
         "sports",
         "stand",
-        "stands"
+        "stands",
+        "seat",
+        "seating"
     ],
     "name": "Bleachers"
 }
diff --git a/data/presets/presets/leisure/common.json b/data/presets/presets/leisure/common.json
index 91de2a283..ce506e6a0 100644
--- a/data/presets/presets/leisure/common.json
+++ b/data/presets/presets/leisure/common.json
@@ -1,7 +1,9 @@
 {
     "icon": "temaki-pedestrian",
     "fields": [
-        "name"
+        "name",
+        "address",
+        "opening_hours"
     ],
     "moreFields": [
         "website"
@@ -10,6 +12,9 @@
         "point",
         "area"
     ],
+    "fields": [
+        "name"
+    ],
     "terms": [
         "open space"
     ],
diff --git a/data/presets/presets/leisure/dance.json b/data/presets/presets/leisure/dance.json
index cb56ea305..c840f0cda 100644
--- a/data/presets/presets/leisure/dance.json
+++ b/data/presets/presets/leisure/dance.json
@@ -8,13 +8,13 @@
         "dance/style"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "level",
         "opening_hours",
         "payment_multi",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/dancing_school.json b/data/presets/presets/leisure/dancing_school.json
index 84b3accb1..d8e695209 100644
--- a/data/presets/presets/leisure/dancing_school.json
+++ b/data/presets/presets/leisure/dancing_school.json
@@ -8,24 +8,24 @@
         "dance/style"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "level",
         "opening_hours",
         "payment_multi",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "dance teaching",
         "jive",
         "swing",
         "tango",
-        "waltz"
+        "waltz",
+        "dance teaching"
     ],
     "tags": {
         "leisure": "dance",
diff --git a/data/presets/presets/leisure/disc_golf_course.json b/data/presets/presets/leisure/disc_golf_course.json
index c27e16871..bdc37380d 100644
--- a/data/presets/presets/leisure/disc_golf_course.json
+++ b/data/presets/presets/leisure/disc_golf_course.json
@@ -32,8 +32,8 @@
     },
     "terms": [
         "disk golf",
-        "flying disc golf",
         "frisbee golf",
+        "flying disc golf",
         "frolf",
         "ultimate"
     ],
diff --git a/data/presets/presets/leisure/dog_park.json b/data/presets/presets/leisure/dog_park.json
index f66be0581..a942a85c0 100644
--- a/data/presets/presets/leisure/dog_park.json
+++ b/data/presets/presets/leisure/dog_park.json
@@ -1,19 +1,27 @@
 {
     "icon": "maki-dog-park",
     "fields": [
-        "name"
+        "name",
+        "operator",
+        "address",
+        "opening_hours",
+        "dog"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
         "area"
     ],
-    "terms": [],
+    "fields": [
+        "name"
+    ],
+    "terms": [
+    ],
     "tags": {
         "leisure": "dog_park"
     },
diff --git a/data/presets/presets/leisure/firepit.json b/data/presets/presets/leisure/firepit.json
index d40ce93bf..cbe165258 100644
--- a/data/presets/presets/leisure/firepit.json
+++ b/data/presets/presets/leisure/firepit.json
@@ -11,8 +11,8 @@
         "leisure": "firepit"
     },
     "terms": [
-        "campfire",
-        "fireplace"
+        "fireplace",
+        "campfire"
     ],
     "name": "Firepit"
 }
diff --git a/data/presets/presets/leisure/fitness_centre.json b/data/presets/presets/leisure/fitness_centre.json
index ba8ac2402..7bd3602e6 100644
--- a/data/presets/presets/leisure/fitness_centre.json
+++ b/data/presets/presets/leisure/fitness_centre.json
@@ -8,13 +8,13 @@
     ],
     "moreFields": [
         "charge_fee",
-        "email",
-        "fax",
-        "fee",
         "opening_hours",
+        "fee",
         "payment_multi",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
@@ -24,8 +24,8 @@
         "leisure": "fitness_centre"
     },
     "terms": [
-        "gym",
         "health",
+        "gym",
         "leisure",
         "studio"
     ],
diff --git a/data/presets/presets/leisure/fitness_centre/yoga.json b/data/presets/presets/leisure/fitness_centre/yoga.json
index ab2cb8cc4..122af3713 100644
--- a/data/presets/presets/leisure/fitness_centre/yoga.json
+++ b/data/presets/presets/leisure/fitness_centre/yoga.json
@@ -5,10 +5,10 @@
         "area"
     ],
     "terms": [
+        "studio",
         "asanas",
-        "meditation",
         "modern yoga",
-        "studio"
+        "meditation"
     ],
     "tags": {
         "leisure": "fitness_centre",
diff --git a/data/presets/presets/leisure/fitness_station/horizontal_bar.json b/data/presets/presets/leisure/fitness_station/horizontal_bar.json
index 5bf0364b0..323c8868b 100644
--- a/data/presets/presets/leisure/fitness_station/horizontal_bar.json
+++ b/data/presets/presets/leisure/fitness_station/horizontal_bar.json
@@ -19,13 +19,13 @@
     },
     "terms": [
         "bar",
-        "chin up",
         "chinup",
+        "chin up",
         "exercise",
         "fitness",
         "gym",
-        "pull up",
         "pullup",
+        "pull up",
         "trim trail"
     ],
     "name": "Exercise Horizontal Bar"
diff --git a/data/presets/presets/leisure/fitness_station/horizontal_ladder.json b/data/presets/presets/leisure/fitness_station/horizontal_ladder.json
index a278f647f..77b1171ef 100644
--- a/data/presets/presets/leisure/fitness_station/horizontal_ladder.json
+++ b/data/presets/presets/leisure/fitness_station/horizontal_ladder.json
@@ -19,15 +19,15 @@
     },
     "terms": [
         "bar",
-        "chin up",
         "chinup",
+        "chin up",
         "exercise",
         "fitness",
         "gym",
         "ladder",
         "monkey bars",
-        "pull up",
         "pullup",
+        "pull up",
         "trim trail"
     ],
     "name": "Exercise Monkey Bars"
diff --git a/data/presets/presets/leisure/fitness_station/push-up.json b/data/presets/presets/leisure/fitness_station/push-up.json
index fba4d0d6f..74b055b08 100644
--- a/data/presets/presets/leisure/fitness_station/push-up.json
+++ b/data/presets/presets/leisure/fitness_station/push-up.json
@@ -22,8 +22,8 @@
         "exercise",
         "fitness",
         "gym",
-        "push up",
         "pushup",
+        "push up",
         "trim trail"
     ],
     "name": "Push-Up Station"
diff --git a/data/presets/presets/leisure/fitness_station/rings.json b/data/presets/presets/leisure/fitness_station/rings.json
index 770ceb2f2..f8b0251cc 100644
--- a/data/presets/presets/leisure/fitness_station/rings.json
+++ b/data/presets/presets/leisure/fitness_station/rings.json
@@ -22,8 +22,8 @@
         "fitness",
         "gym",
         "muscle up",
-        "pull up",
         "pullup",
+        "pull up",
         "trim trail"
     ],
     "name": "Exercise Rings"
diff --git a/data/presets/presets/leisure/fitness_station/sit-up.json b/data/presets/presets/leisure/fitness_station/sit-up.json
index 05a7e96cd..c50d02202 100644
--- a/data/presets/presets/leisure/fitness_station/sit-up.json
+++ b/data/presets/presets/leisure/fitness_station/sit-up.json
@@ -22,8 +22,8 @@
         "exercise",
         "fitness",
         "gym",
-        "sit up",
         "situp",
+        "sit up",
         "trim trail"
     ],
     "name": "Sit-Up Station"
diff --git a/data/presets/presets/leisure/garden.json b/data/presets/presets/leisure/garden.json
index 23c1e275e..d7c999379 100644
--- a/data/presets/presets/leisure/garden.json
+++ b/data/presets/presets/leisure/garden.json
@@ -9,10 +9,10 @@
         "charge_fee"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/golf_course.json b/data/presets/presets/leisure/golf_course.json
index 798969a26..e19df464c 100644
--- a/data/presets/presets/leisure/golf_course.json
+++ b/data/presets/presets/leisure/golf_course.json
@@ -7,11 +7,11 @@
         "opening_hours"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "payment_multi",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/hackerspace.json b/data/presets/presets/leisure/hackerspace.json
index 06a2bc871..35028b9bc 100644
--- a/data/presets/presets/leisure/hackerspace.json
+++ b/data/presets/presets/leisure/hackerspace.json
@@ -27,9 +27,9 @@
         "area"
     ],
     "terms": [
-        "hacklab",
+        "makerspace",
         "hackspace",
-        "makerspace"
+        "hacklab"
     ],
     "tags": {
         "leisure": "hackerspace"
diff --git a/data/presets/presets/leisure/horse_riding.json b/data/presets/presets/leisure/horse_riding.json
index ff07af779..1f1522d5d 100644
--- a/data/presets/presets/leisure/horse_riding.json
+++ b/data/presets/presets/leisure/horse_riding.json
@@ -8,12 +8,12 @@
         "building"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "opening_hours",
         "payment_multi",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/ice_rink.json b/data/presets/presets/leisure/ice_rink.json
index d8adf3dec..44efa53df 100644
--- a/data/presets/presets/leisure/ice_rink.json
+++ b/data/presets/presets/leisure/ice_rink.json
@@ -9,22 +9,22 @@
         "building"
     ],
     "moreFields": [
-        "email",
-        "fax",
-        "level",
         "opening_hours",
         "payment_multi",
+        "level",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "curling",
         "hockey",
-        "skating"
+        "skating",
+        "curling"
     ],
     "tags": {
         "leisure": "ice_rink"
diff --git a/data/presets/presets/leisure/marina.json b/data/presets/presets/leisure/marina.json
index 0eb663554..771fee736 100644
--- a/data/presets/presets/leisure/marina.json
+++ b/data/presets/presets/leisure/marina.json
@@ -10,16 +10,16 @@
         "sanitary_dump_station",
         "power_supply"
     ],
-    "moreFields": [
+    "moreFields" : [
         "address",
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
-        "phone",
         "seamark/type",
-        "website"
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/miniature_golf.json b/data/presets/presets/leisure/miniature_golf.json
index 0a26fe8ca..23c06a97d 100644
--- a/data/presets/presets/leisure/miniature_golf.json
+++ b/data/presets/presets/leisure/miniature_golf.json
@@ -10,10 +10,10 @@
         "charge_fee"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/nature_reserve.json b/data/presets/presets/leisure/nature_reserve.json
index d3df0e7b9..6abc93f7e 100644
--- a/data/presets/presets/leisure/nature_reserve.json
+++ b/data/presets/presets/leisure/nature_reserve.json
@@ -12,10 +12,10 @@
     ],
     "moreFields": [
         "dog",
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "tags": {
         "leisure": "nature_reserve"
diff --git a/data/presets/presets/leisure/outdoor_seating.json b/data/presets/presets/leisure/outdoor_seating.json
index e9373524b..2090a1947 100644
--- a/data/presets/presets/leisure/outdoor_seating.json
+++ b/data/presets/presets/leisure/outdoor_seating.json
@@ -13,13 +13,13 @@
     ],
     "terms": [
         "al fresco",
-        "bar",
         "beer garden",
-        "cafe",
         "dining",
-        "patio",
+        "cafe",
+        "restaurant",
         "pub",
-        "restaurant"
+        "bar",
+        "patio"
     ],
     "tags": {
         "leisure": "outdoor_seating"
diff --git a/data/presets/presets/leisure/park.json b/data/presets/presets/leisure/park.json
index 0bcc9f9f0..bcd5da096 100644
--- a/data/presets/presets/leisure/park.json
+++ b/data/presets/presets/leisure/park.json
@@ -8,11 +8,11 @@
     ],
     "moreFields": [
         "dog",
-        "email",
-        "fax",
-        "phone",
         "smoking",
-        "website"
+        "website",
+        "phone",
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/picnic_table/chess.json b/data/presets/presets/leisure/picnic_table/chess.json
index 7ab7f3f20..d2c480222 100644
--- a/data/presets/presets/leisure/picnic_table/chess.json
+++ b/data/presets/presets/leisure/picnic_table/chess.json
@@ -13,10 +13,10 @@
     },
     "terms": [
         "bench",
+        "chess board",
         "checkerboard",
         "checkers",
         "chequerboard",
-        "chess board",
         "game table"
     ],
     "name": "Chess Table"
diff --git a/data/presets/presets/leisure/pitch/australian_football.json b/data/presets/presets/leisure/pitch/australian_football.json
index a66eb1bdf..86e3fbb2c 100644
--- a/data/presets/presets/leisure/pitch/australian_football.json
+++ b/data/presets/presets/leisure/pitch/australian_football.json
@@ -13,8 +13,8 @@
         "value": "australian_football"
     },
     "terms": [
-        "AFL",
         "Aussie",
+        "AFL",
         "football"
     ],
     "name": "Australian Football Field"
diff --git a/data/presets/presets/leisure/pitch/soccer.json b/data/presets/presets/leisure/pitch/soccer.json
index fa7def4a7..e6399cf8e 100644
--- a/data/presets/presets/leisure/pitch/soccer.json
+++ b/data/presets/presets/leisure/pitch/soccer.json
@@ -13,7 +13,7 @@
         "value": "soccer"
     },
     "terms": [
-        "football"
+    	"football"
     ],
     "name": "Soccer Field"
 }
diff --git a/data/presets/presets/leisure/pitch/softball.json b/data/presets/presets/leisure/pitch/softball.json
index d7aec2c8e..7aaa317e6 100644
--- a/data/presets/presets/leisure/pitch/softball.json
+++ b/data/presets/presets/leisure/pitch/softball.json
@@ -1,20 +1,20 @@
 {
-    "icon": "maki-baseball",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "leisure": "pitch",
-        "sport": "softball"
-    },
-    "reference": {
-        "key": "sport",
-        "value": "softball"
-    },
-    "terms": [
-        "diamond",
-        "softball"
-    ],
-    "name": "Softball Field"
+  "icon": "maki-baseball",
+  "geometry": [
+    "point",
+    "area"
+  ],
+  "tags": {
+    "leisure": "pitch",
+    "sport": "softball"
+  },
+  "reference": {
+    "key": "sport",
+    "value": "softball"
+  },
+  "terms": [
+    "softball",
+    "diamond"
+  ],
+  "name": "Softball Field"
 }
diff --git a/data/presets/presets/leisure/pitch/table_tennis.json b/data/presets/presets/leisure/pitch/table_tennis.json
index 5052d36a8..5dc6dd9c2 100644
--- a/data/presets/presets/leisure/pitch/table_tennis.json
+++ b/data/presets/presets/leisure/pitch/table_tennis.json
@@ -18,8 +18,8 @@
         "value": "table_tennis"
     },
     "terms": [
-        "ping pong",
-        "table tennis"
+        "table tennis",
+        "ping pong"
     ],
     "name": "Ping Pong Table"
 }
diff --git a/data/presets/presets/leisure/sauna.json b/data/presets/presets/leisure/sauna.json
index 7b012afaf..7e5909b10 100644
--- a/data/presets/presets/leisure/sauna.json
+++ b/data/presets/presets/leisure/sauna.json
@@ -11,11 +11,11 @@
         "charge_fee"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "level",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/slipway.json b/data/presets/presets/leisure/slipway.json
index dd6dd1b1f..fe7e5360a 100644
--- a/data/presets/presets/leisure/slipway.json
+++ b/data/presets/presets/leisure/slipway.json
@@ -19,9 +19,9 @@
         "line"
     ],
     "terms": [
-        "boat landing",
         "boat launch",
-        "boat ramp"
+        "boat ramp",
+        "boat landing"
     ],
     "tags": {
         "leisure": "slipway"
diff --git a/data/presets/presets/leisure/slipway_point.json b/data/presets/presets/leisure/slipway_point.json
index ccc72f6f2..80b119e94 100644
--- a/data/presets/presets/leisure/slipway_point.json
+++ b/data/presets/presets/leisure/slipway_point.json
@@ -11,9 +11,9 @@
         "vertex"
     ],
     "terms": [
-        "boat landing",
         "boat launch",
-        "boat ramp"
+        "boat ramp",
+        "boat landing"
     ],
     "tags": {
         "leisure": "slipway"
diff --git a/data/presets/presets/leisure/sports_centre.json b/data/presets/presets/leisure/sports_centre.json
index 5ed928f15..08eff4a4f 100644
--- a/data/presets/presets/leisure/sports_centre.json
+++ b/data/presets/presets/leisure/sports_centre.json
@@ -10,11 +10,11 @@
         "charge_fee"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "opening_hours",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
@@ -23,6 +23,7 @@
     "tags": {
         "leisure": "sports_centre"
     },
-    "terms": [],
+    "terms": [
+    ],
     "name": "Sports Center / Complex"
 }
diff --git a/data/presets/presets/leisure/sports_centre/climbing.json b/data/presets/presets/leisure/sports_centre/climbing.json
index 3f373110a..2a1d836c8 100644
--- a/data/presets/presets/leisure/sports_centre/climbing.json
+++ b/data/presets/presets/leisure/sports_centre/climbing.json
@@ -9,15 +9,15 @@
         "artificial climbing wall",
         "belaying",
         "bouldering",
+        "rock climbing facility",
         "indoor rock wall",
         "rappeling",
-        "rock climbing facility",
         "rock gym",
         "ropes"
     ],
     "tags": {
-        "leisure": "sports_centre",
-        "sport": "climbing"
+      "leisure": "sports_centre",
+      "sport": "climbing"
     },
     "reference": {
         "key": "sport",
diff --git a/data/presets/presets/leisure/sports_centre/swimming.json b/data/presets/presets/leisure/sports_centre/swimming.json
index df445e242..59b1f07d1 100644
--- a/data/presets/presets/leisure/sports_centre/swimming.json
+++ b/data/presets/presets/leisure/sports_centre/swimming.json
@@ -9,8 +9,8 @@
         "water"
     ],
     "tags": {
-        "leisure": "sports_centre",
-        "sport": "swimming"
+      "leisure": "sports_centre",
+      "sport": "swimming"
     },
     "reference": {
         "key": "sport",
diff --git a/data/presets/presets/leisure/stadium.json b/data/presets/presets/leisure/stadium.json
index d30bbc67c..105fd501c 100644
--- a/data/presets/presets/leisure/stadium.json
+++ b/data/presets/presets/leisure/stadium.json
@@ -6,10 +6,10 @@
         "address"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"    
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/leisure/swimming_area.json b/data/presets/presets/leisure/swimming_area.json
index a2ba1740f..1d8e988a9 100644
--- a/data/presets/presets/leisure/swimming_area.json
+++ b/data/presets/presets/leisure/swimming_area.json
@@ -17,9 +17,9 @@
         "area"
     ],
     "terms": [
-        "aquatics",
         "dive",
-        "water"
+        "water",
+        "aquatics"
     ],
     "tags": {
         "leisure": "swimming_area"
diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json
index d333854df..237196a85 100644
--- a/data/presets/presets/leisure/swimming_pool.json
+++ b/data/presets/presets/leisure/swimming_pool.json
@@ -19,9 +19,9 @@
         "area"
     ],
     "terms": [
-        "aquatics",
         "dive",
-        "water"
+        "water",
+        "aquatics"
     ],
     "tags": {
         "leisure": "swimming_pool"
diff --git a/data/presets/presets/leisure/track/horse_racing.json b/data/presets/presets/leisure/track/horse_racing.json
index a52977485..ed96d3696 100644
--- a/data/presets/presets/leisure/track/horse_racing.json
+++ b/data/presets/presets/leisure/track/horse_racing.json
@@ -19,9 +19,9 @@
     "terms": [
         "equestrian race track",
         "horse race betting",
-        "horse racetrack",
         "horseracing",
-        "horsetrack"
+        "horsetrack",
+        "horse racetrack"
     ],
     "name": "Horse Racing Track"
 }
diff --git a/data/presets/presets/leisure/track/horse_racing_point.json b/data/presets/presets/leisure/track/horse_racing_point.json
index a26e99fba..676c08ec7 100644
--- a/data/presets/presets/leisure/track/horse_racing_point.json
+++ b/data/presets/presets/leisure/track/horse_racing_point.json
@@ -13,9 +13,9 @@
     "terms": [
         "equestrian race track",
         "horse race betting",
-        "horse racetrack",
         "horseracing",
-        "horsetrack"
+        "horsetrack",
+        "horse racetrack"
     ],
     "name": "Horse Racing Track"
 }
diff --git a/data/presets/presets/leisure/water_park.json b/data/presets/presets/leisure/water_park.json
index c3d265db7..a5ff7596a 100644
--- a/data/presets/presets/leisure/water_park.json
+++ b/data/presets/presets/leisure/water_park.json
@@ -6,21 +6,21 @@
         "address"
     ],
     "moreFields": [
-        "brand",
-        "email",
-        "fax",
         "payment_multi",
+        "brand",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "dive",
+        "swim",
         "pool",
-        "swim"
+        "dive"
     ],
     "tags": {
         "leisure": "water_park"
diff --git a/data/presets/presets/man_made/antenna.json b/data/presets/presets/man_made/antenna.json
index 11e15cd4e..1e507df9f 100644
--- a/data/presets/presets/man_made/antenna.json
+++ b/data/presets/presets/man_made/antenna.json
@@ -11,8 +11,8 @@
     ],
     "terms": [
         "broadcast",
-        "cell",
         "cell phone",
+        "cell",
         "communication",
         "mobile phone",
         "radio",
diff --git a/data/presets/presets/man_made/cairn.json b/data/presets/presets/man_made/cairn.json
index 5086ff569..e4fa7a670 100644
--- a/data/presets/presets/man_made/cairn.json
+++ b/data/presets/presets/man_made/cairn.json
@@ -5,10 +5,10 @@
         "area"
     ],
     "terms": [
-        "càrn",
         "rock pile",
+        "stone stack",
         "stone pile",
-        "stone stack"
+        "càrn"
     ],
     "tags": {
         "man_made": "cairn"
diff --git a/data/presets/presets/man_made/dyke.json b/data/presets/presets/man_made/dyke.json
index dedbc3997..88304126c 100644
--- a/data/presets/presets/man_made/dyke.json
+++ b/data/presets/presets/man_made/dyke.json
@@ -6,10 +6,7 @@
         "man_made": "dyke"
     },
     "terms": [
-        "Dike",
-        "Dyke",
-        "Floodbank",
-        "Stopbank"
+        "Dike", "Dyke", "Floodbank", "Stopbank"
     ],
     "name": "Levee"
 }
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
index 98dce19ef..619890817 100644
--- a/data/presets/presets/man_made/mast.json
+++ b/data/presets/presets/man_made/mast.json
@@ -6,9 +6,9 @@
         "height"
     ],
     "moreFields": [
-        "communication_multi",
         "manufacturer",
-        "material"
+        "material",
+        "communication_multi"
     ],
     "geometry": [
         "point"
diff --git a/data/presets/presets/man_made/monitoring_station.json b/data/presets/presets/man_made/monitoring_station.json
index c4fde6352..e05a69092 100644
--- a/data/presets/presets/man_made/monitoring_station.json
+++ b/data/presets/presets/man_made/monitoring_station.json
@@ -11,11 +11,11 @@
         "manufacturer"
     ],
     "terms": [
-        "air",
+        "weather",
         "earthquake",
-        "gps",
         "seismology",
-        "weather"
+        "air",
+        "gps"
     ],
     "tags": {
         "man_made": "monitoring_station"
diff --git a/data/presets/presets/man_made/observatory.json b/data/presets/presets/man_made/observatory.json
index 8c4faa794..e54c1030f 100644
--- a/data/presets/presets/man_made/observatory.json
+++ b/data/presets/presets/man_made/observatory.json
@@ -7,10 +7,10 @@
         "building_area"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/man_made/petroleum_well.json b/data/presets/presets/man_made/petroleum_well.json
index 8c8d3ee5e..a875be74d 100644
--- a/data/presets/presets/man_made/petroleum_well.json
+++ b/data/presets/presets/man_made/petroleum_well.json
@@ -8,8 +8,8 @@
         "oil derrick",
         "oil drill",
         "oil horse",
-        "oil pump",
         "oil rig",
+        "oil pump",
         "petroleum well",
         "pumpjack"
     ],
diff --git a/data/presets/presets/man_made/pier.json b/data/presets/presets/man_made/pier.json
index 1adf4bb42..a57584e16 100644
--- a/data/presets/presets/man_made/pier.json
+++ b/data/presets/presets/man_made/pier.json
@@ -9,10 +9,10 @@
         "lit"
     ],
     "moreFields": [
-        "{highway/footway}",
         "access",
         "fishing",
-        "incline"
+        "incline",
+        "{highway/footway}"
     ],
     "geometry": [
         "line",
diff --git a/data/presets/presets/man_made/pipeline.json b/data/presets/presets/man_made/pipeline.json
index ba5e71f5d..153a57b2a 100644
--- a/data/presets/presets/man_made/pipeline.json
+++ b/data/presets/presets/man_made/pipeline.json
@@ -11,11 +11,11 @@
         "line"
     ],
     "terms": [
-        "natural gas",
         "oil",
-        "sewage",
+        "natural gas",
+        "water",
         "sewer",
-        "water"
+        "sewage"
     ],
     "tags": {
         "man_made": "pipeline"
diff --git a/data/presets/presets/man_made/pipeline/underground.json b/data/presets/presets/man_made/pipeline/underground.json
index a98c7b78a..8b60c68b6 100644
--- a/data/presets/presets/man_made/pipeline/underground.json
+++ b/data/presets/presets/man_made/pipeline/underground.json
@@ -4,11 +4,11 @@
         "line"
     ],
     "terms": [
-        "natural gas",
         "oil",
-        "sewage",
+        "natural gas",
+        "water",
         "sewer",
-        "water"
+        "sewage"
     ],
     "tags": {
         "man_made": "pipeline",
diff --git a/data/presets/presets/man_made/pipeline/valve.json b/data/presets/presets/man_made/pipeline/valve.json
index f1f1b6bce..b888f4ee0 100644
--- a/data/presets/presets/man_made/pipeline/valve.json
+++ b/data/presets/presets/man_made/pipeline/valve.json
@@ -15,11 +15,11 @@
         "material"
     ],
     "terms": [
-        "natural gas",
         "oil",
-        "sewage",
+        "natural gas",
+        "water",
         "sewer",
-        "water"
+        "sewage"
     ],
     "tags": {
         "man_made": "pipeline",
diff --git a/data/presets/presets/man_made/silo.json b/data/presets/presets/man_made/silo.json
index 4b2784bc7..77e6c899a 100644
--- a/data/presets/presets/man_made/silo.json
+++ b/data/presets/presets/man_made/silo.json
@@ -9,8 +9,8 @@
         "area"
     ],
     "terms": [
-        "corn",
         "grain",
+        "corn",
         "wheat"
     ],
     "tags": {
diff --git a/data/presets/presets/man_made/storage_tank.json b/data/presets/presets/man_made/storage_tank.json
index 35fb3b26b..03b92641c 100644
--- a/data/presets/presets/man_made/storage_tank.json
+++ b/data/presets/presets/man_made/storage_tank.json
@@ -18,10 +18,10 @@
         "area"
     ],
     "terms": [
-        "gas",
+        "water",
         "oil",
-        "petrol",
-        "water"
+        "gas",
+        "petrol"
     ],
     "tags": {
         "man_made": "storage_tank"
diff --git a/data/presets/presets/man_made/surveillance.json b/data/presets/presets/man_made/surveillance.json
index fec4cd930..0265586be 100644
--- a/data/presets/presets/man_made/surveillance.json
+++ b/data/presets/presets/man_made/surveillance.json
@@ -9,10 +9,10 @@
         "surveillance/type",
         "surveillance/zone",
         "direction"
-    ],
+     ],
     "terms": [
-        "alpr",
         "anpr",
+        "alpr",
         "camera",
         "car plate recognition",
         "cctv",
diff --git a/data/presets/presets/man_made/surveillance/camera.json b/data/presets/presets/man_made/surveillance/camera.json
index ce4e3568f..469914143 100644
--- a/data/presets/presets/man_made/surveillance/camera.json
+++ b/data/presets/presets/man_made/surveillance/camera.json
@@ -17,8 +17,8 @@
         "manufacturer"
     ],
     "terms": [
-        "alpr",
         "anpr",
+        "alpr",
         "camera",
         "car plate recognition",
         "cctv",
diff --git a/data/presets/presets/man_made/survey_point.json b/data/presets/presets/man_made/survey_point.json
index ed39ef239..c40173c93 100644
--- a/data/presets/presets/man_made/survey_point.json
+++ b/data/presets/presets/man_made/survey_point.json
@@ -8,8 +8,8 @@
         "vertex"
     ],
     "terms": [
-        "triangulation pillar",
         "trig point",
+        "triangulation pillar",
         "trigonometrical station"
     ],
     "tags": {
diff --git a/data/presets/presets/man_made/tower/defensive.json b/data/presets/presets/man_made/tower/defensive.json
index 6b3be773f..9b3ffbaa5 100644
--- a/data/presets/presets/man_made/tower/defensive.json
+++ b/data/presets/presets/man_made/tower/defensive.json
@@ -13,8 +13,8 @@
         "value": "defensive"
     },
     "terms": [
-        "Castle Tower",
-        "Defensive Tower"
+        "Defensive Tower",
+        "Castle Tower"
     ],
     "name": "Fortified Tower"
 }
diff --git a/data/presets/presets/man_made/tower/observation.json b/data/presets/presets/man_made/tower/observation.json
index 253f8387a..a9e2996eb 100644
--- a/data/presets/presets/man_made/tower/observation.json
+++ b/data/presets/presets/man_made/tower/observation.json
@@ -9,8 +9,8 @@
         "area"
     ],
     "terms": [
-        "fire tower",
-        "lookout tower"
+        "lookout tower",
+        "fire tower"
     ],
     "tags": {
         "man_made": "tower",
diff --git a/data/presets/presets/man_made/wastewater_plant.json b/data/presets/presets/man_made/wastewater_plant.json
index ce68dd511..c18ee06bc 100644
--- a/data/presets/presets/man_made/wastewater_plant.json
+++ b/data/presets/presets/man_made/wastewater_plant.json
@@ -1,24 +1,24 @@
 {
     "icon": "maki-water",
     "fields": [
-        "name",
+	    "name",
         "operator",
         "address"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
         "area"
     ],
     "terms": [
-        "reclamation plant",
         "sewage*",
-        "water treatment plant"
+        "water treatment plant",
+        "reclamation plant"
     ],
     "tags": {
         "man_made": "wastewater_plant"
diff --git a/data/presets/presets/man_made/watermill.json b/data/presets/presets/man_made/watermill.json
index 1e51467cc..745132918 100644
--- a/data/presets/presets/man_made/watermill.json
+++ b/data/presets/presets/man_made/watermill.json
@@ -8,9 +8,9 @@
         "area"
     ],
     "terms": [
-        "mill",
         "water",
-        "wheel"
+        "wheel",
+        "mill"
     ],
     "tags": {
         "man_made": "watermill"
diff --git a/data/presets/presets/man_made/windmill.json b/data/presets/presets/man_made/windmill.json
index bdd1dc40d..7fc84f831 100644
--- a/data/presets/presets/man_made/windmill.json
+++ b/data/presets/presets/man_made/windmill.json
@@ -8,9 +8,9 @@
         "area"
     ],
     "terms": [
-        "mill",
+        "wind",
         "wheel",
-        "wind"
+        "mill"
     ],
     "tags": {
         "man_made": "windmill"
diff --git a/data/presets/presets/man_made/works.json b/data/presets/presets/man_made/works.json
index 364719685..5325831c8 100644
--- a/data/presets/presets/man_made/works.json
+++ b/data/presets/presets/man_made/works.json
@@ -1,17 +1,17 @@
 {
     "icon": "maki-industry",
     "fields": [
-        "name",
+	    "name",
         "operator",
         "address",
         "building_area",
         "product"
     ],
     "moreFields": [
-        "email",
-        "fax",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
@@ -19,13 +19,13 @@
     ],
     "terms": [
         "assembly",
-        "brewery",
         "build",
+        "brewery",
         "car",
-        "manufacture",
         "plant",
         "plastic",
         "processing",
+        "manufacture",
         "refinery"
     ],
     "tags": {
diff --git a/data/presets/presets/manhole.json b/data/presets/presets/manhole.json
index f7052ec55..49c303256 100644
--- a/data/presets/presets/manhole.json
+++ b/data/presets/presets/manhole.json
@@ -20,8 +20,8 @@
     "terms": [
         "cover",
         "hole",
-        "sewage",
         "sewer",
+        "sewage",
         "telecom"
     ],
     "name": "Manhole"
diff --git a/data/presets/presets/manhole/drain.json b/data/presets/presets/manhole/drain.json
index c6fba62b2..1046f0398 100644
--- a/data/presets/presets/manhole/drain.json
+++ b/data/presets/presets/manhole/drain.json
@@ -20,8 +20,8 @@
         "drain",
         "hole",
         "rain",
-        "sewage",
         "sewer",
+        "sewage",
         "storm"
     ],
     "name": "Storm Drain"
diff --git a/data/presets/presets/manhole/telecom.json b/data/presets/presets/manhole/telecom.json
index 085feaca1..2a0cdba4d 100644
--- a/data/presets/presets/manhole/telecom.json
+++ b/data/presets/presets/manhole/telecom.json
@@ -16,12 +16,12 @@
         "manhole": "telecom"
     },
     "terms": [
-        "bt",
         "cover",
-        "hole",
         "phone",
+        "hole",
         "telecom",
-        "telephone"
+        "telephone",
+        "bt"
     ],
     "name": "Telecom Manhole"
 }
diff --git a/data/presets/presets/natural/cave_entrance.json b/data/presets/presets/natural/cave_entrance.json
index 29b66cc67..fd75acbb7 100644
--- a/data/presets/presets/natural/cave_entrance.json
+++ b/data/presets/presets/natural/cave_entrance.json
@@ -18,10 +18,10 @@
     },
     "terms": [
         "cavern",
-        "cavity",
-        "grotto",
         "hollow",
-        "shelter"
+        "grotto",
+        "shelter",
+        "cavity"
     ],
     "name": "Cave Entrance"
 }
diff --git a/data/presets/presets/natural/rock.json b/data/presets/presets/natural/rock.json
index d91a7d8ce..38ea34d92 100644
--- a/data/presets/presets/natural/rock.json
+++ b/data/presets/presets/natural/rock.json
@@ -12,8 +12,8 @@
     },
     "terms": [
         "boulder",
-        "rock",
-        "stone"
+        "stone",
+        "rock"
     ],
     "name": "Attached Rock / Boulder"
 }
diff --git a/data/presets/presets/natural/saddle.json b/data/presets/presets/natural/saddle.json
index 51dc09da5..7cb1fa812 100644
--- a/data/presets/presets/natural/saddle.json
+++ b/data/presets/presets/natural/saddle.json
@@ -11,8 +11,8 @@
         "natural": "saddle"
     },
     "terms": [
-        "mountain pass",
         "pass",
+        "mountain pass",
         "top"
     ],
     "name": "Saddle"
diff --git a/data/presets/presets/natural/stone.json b/data/presets/presets/natural/stone.json
index 249f34b59..423ab638b 100644
--- a/data/presets/presets/natural/stone.json
+++ b/data/presets/presets/natural/stone.json
@@ -12,8 +12,8 @@
     },
     "terms": [
         "boulder",
-        "rock",
-        "stone"
+        "stone",
+        "rock"
     ],
     "name": "Unattached Stone / Boulder"
 }
diff --git a/data/presets/presets/natural/valley.json b/data/presets/presets/natural/valley.json
index 959acc808..ec4cc089c 100644
--- a/data/presets/presets/natural/valley.json
+++ b/data/presets/presets/natural/valley.json
@@ -21,8 +21,8 @@
         "depression",
         "glen",
         "gorge",
-        "gulley",
         "gully",
+        "gulley",
         "gultch",
         "hollow",
         "ravine",
diff --git a/data/presets/presets/natural/volcano.json b/data/presets/presets/natural/volcano.json
index cd24b29ea..066a69ebd 100644
--- a/data/presets/presets/natural/volcano.json
+++ b/data/presets/presets/natural/volcano.json
@@ -14,8 +14,8 @@
         "natural": "volcano"
     },
     "terms": [
-        "crater",
-        "mountain"
+        "mountain",
+        "crater"
     ],
     "name": "Volcano"
 }
diff --git a/data/presets/presets/natural/water/pond.json b/data/presets/presets/natural/water/pond.json
index bcebb42a4..69f9dcbb9 100644
--- a/data/presets/presets/natural/water/pond.json
+++ b/data/presets/presets/natural/water/pond.json
@@ -17,10 +17,10 @@
     },
     "terms": [
         "lakelet",
-        "mere",
         "millpond",
+        "tarn",
         "pool",
-        "tarn"
+        "mere"
     ],
     "name": "Pond"
 }
diff --git a/data/presets/presets/natural/water/wastewater.json b/data/presets/presets/natural/water/wastewater.json
index 0abe71c0f..a78029d37 100644
--- a/data/presets/presets/natural/water/wastewater.json
+++ b/data/presets/presets/natural/water/wastewater.json
@@ -12,12 +12,12 @@
         "value": "wastewater"
     },
     "terms": [
-        "Clarifier Basin",
         "excrement",
-        "Settling Basin",
-        "sewage",
         "shit",
-        "wastewater"
+        "sewage",
+        "wastewater",
+        "Settling Basin",
+        "Clarifier Basin"
     ],
     "name": "Wastewater Basin"
 }
diff --git a/data/presets/presets/noexit/yes.json b/data/presets/presets/noexit/yes.json
index 10641b822..c23612151 100644
--- a/data/presets/presets/noexit/yes.json
+++ b/data/presets/presets/noexit/yes.json
@@ -4,9 +4,9 @@
         "vertex"
     ],
     "terms": [
-        "dead end",
         "no exit",
-        "road end"
+        "road end",
+        "dead end"
     ],
     "tags": {
         "noexit": "yes"
diff --git a/data/presets/presets/office.json b/data/presets/presets/office.json
index 01ec84eb1..33906e0ed 100644
--- a/data/presets/presets/office.json
+++ b/data/presets/presets/office.json
@@ -10,9 +10,9 @@
     "moreFields": [
         "air_conditioning",
         "building/levels_building",
+        "height_building",
         "email",
         "fax",
-        "height_building",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
diff --git a/data/presets/presets/office/estate_agent.json b/data/presets/presets/office/estate_agent.json
index bee728617..51ae020f2 100644
--- a/data/presets/presets/office/estate_agent.json
+++ b/data/presets/presets/office/estate_agent.json
@@ -7,8 +7,6 @@
     "tags": {
         "office": "estate_agent"
     },
-    "terms": [
-        "real estate"
-    ],
+    "terms": ["real estate"],
     "name": "Real Estate Office"
 }
diff --git a/data/presets/presets/office/financial_advisor.json b/data/presets/presets/office/financial_advisor.json
index 9b9b12a8d..463c11964 100644
--- a/data/presets/presets/office/financial_advisor.json
+++ b/data/presets/presets/office/financial_advisor.json
@@ -10,9 +10,9 @@
     "terms": [
         "401k",
         "inheritance",
-        "retirement",
         "savings",
         "stocks",
+        "retirement",
         "wealth management"
     ],
     "name": "Financial Advisor"
diff --git a/data/presets/presets/office/government/register_office.json b/data/presets/presets/office/government/register_office.json
index 8fc0e1708..bfe40e06d 100644
--- a/data/presets/presets/office/government/register_office.json
+++ b/data/presets/presets/office/government/register_office.json
@@ -9,11 +9,11 @@
         "area"
     ],
     "terms": [
-        "birth",
-        "certificate",
         "clerk",
+        "marriage",
         "death",
-        "marriage"
+        "birth",
+        "certificate"
     ],
     "tags": {
         "office": "government",
diff --git a/data/presets/presets/office/government/tax.json b/data/presets/presets/office/government/tax.json
index cc10ddcd6..1f5a946e4 100644
--- a/data/presets/presets/office/government/tax.json
+++ b/data/presets/presets/office/government/tax.json
@@ -1,25 +1,25 @@
 {
-    "icon": "maki-town-hall",
-    "fields": [
-        "{office}",
-        "operator"
-    ],
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "terms": [
-        "fiscal authorities",
-        "revenue office",
-        "tax office"
-    ],
-    "tags": {
-        "office": "government",
-        "government": "tax"
-    },
-    "reference": {
-        "key": "government",
-        "value": "tax"
-    },
-    "name": "Tax and Revenue Office"
+  "icon": "maki-town-hall",
+  "fields": [
+      "{office}",
+      "operator"
+  ],
+  "geometry": [
+      "point",
+      "area"
+  ],
+  "terms": [
+      "fiscal authorities",
+      "revenue office",
+      "tax office"
+  ],
+  "tags": {
+      "office": "government",
+      "government": "tax"
+  },
+  "reference": {
+      "key": "government",
+      "value": "tax"
+  },
+  "name": "Tax and Revenue Office"
 }
diff --git a/data/presets/presets/office/ngo.json b/data/presets/presets/office/ngo.json
index d975dafe7..f5bab99bd 100644
--- a/data/presets/presets/office/ngo.json
+++ b/data/presets/presets/office/ngo.json
@@ -11,8 +11,8 @@
         "ngo",
         "non government",
         "non-government",
-        "organisation",
-        "organization"
+        "organization",
+        "organisation"
     ],
     "name": "NGO Office"
 }
diff --git a/data/presets/presets/office/private_investigator.json b/data/presets/presets/office/private_investigator.json
index d065fc086..f16b507bc 100644
--- a/data/presets/presets/office/private_investigator.json
+++ b/data/presets/presets/office/private_investigator.json
@@ -9,8 +9,8 @@
     },
     "terms": [
         "PI",
-        "private detective",
-        "private eye"
+        "private eye",
+        "private detective"
     ],
     "name": "Private Investigator Office"
 }
diff --git a/data/presets/presets/office/quango.json b/data/presets/presets/office/quango.json
index f88f51aea..6af3918e2 100644
--- a/data/presets/presets/office/quango.json
+++ b/data/presets/presets/office/quango.json
@@ -11,8 +11,8 @@
         "ngo",
         "non government",
         "non-government",
-        "organisation",
         "organization",
+        "organisation",
         "quasi autonomous",
         "quasi-autonomous"
     ],
diff --git a/data/presets/presets/office/water_utility.json b/data/presets/presets/office/water_utility.json
index 6e8002795..23e29ba0f 100644
--- a/data/presets/presets/office/water_utility.json
+++ b/data/presets/presets/office/water_utility.json
@@ -12,8 +12,8 @@
         "office": "water_utility"
     },
     "terms": [
-        "utility",
-        "water board"
+        "water board",
+        "utility"
     ],
     "name": "Water Utility Office"
 }
diff --git a/data/presets/presets/piste/downhill.json b/data/presets/presets/piste/downhill.json
index d1fe4b825..454724ee5 100644
--- a/data/presets/presets/piste/downhill.json
+++ b/data/presets/presets/piste/downhill.json
@@ -13,11 +13,11 @@
         "area"
     ],
     "terms": [
-        "alpine",
-        "downhill",
-        "piste",
         "ski",
-        "snowboard"
+        "alpine",
+        "snowboard",
+        "downhill",
+        "piste"
     ],
     "tags": {
         "piste:type": "downhill"
diff --git a/data/presets/presets/piste/downhill/halfpipe.json b/data/presets/presets/piste/downhill/halfpipe.json
index e6d4aa4fc..e903c4aaa 100644
--- a/data/presets/presets/piste/downhill/halfpipe.json
+++ b/data/presets/presets/piste/downhill/halfpipe.json
@@ -5,13 +5,13 @@
         "area"
     ],
     "terms": [
-        "alpine",
-        "downhill",
-        "half pipe",
-        "halfpipe",
-        "piste",
         "ski",
-        "snowboard"
+        "alpine",
+        "halfpipe",
+        "half pipe",
+        "snowboard",
+        "downhill",
+        "piste"
     ],
     "tags": {
         "piste:type": "downhill",
diff --git a/data/presets/presets/piste/hike.json b/data/presets/presets/piste/hike.json
index 37c928bb0..9ead22670 100644
--- a/data/presets/presets/piste/hike.json
+++ b/data/presets/presets/piste/hike.json
@@ -14,11 +14,11 @@
     ],
     "terms": [
         "hike",
-        "piste",
-        "ski",
+        "winter hiking",
         "snowshoe",
         "snowshoeing",
-        "winter hiking"
+        "piste",
+        "ski"
     ],
     "tags": {
         "piste:type": "hike"
diff --git a/data/presets/presets/piste/ice_skate.json b/data/presets/presets/piste/ice_skate.json
index cd365a34f..c5f8650d7 100644
--- a/data/presets/presets/piste/ice_skate.json
+++ b/data/presets/presets/piste/ice_skate.json
@@ -13,9 +13,9 @@
     ],
     "terms": [
         "ice",
-        "piste",
         "skating",
-        "ski"
+        "ski",
+        "piste"
     ],
     "tags": {
         "piste:type": "ice_skate"
diff --git a/data/presets/presets/piste/nordic.json b/data/presets/presets/piste/nordic.json
index 97494b1fb..5774c79c3 100644
--- a/data/presets/presets/piste/nordic.json
+++ b/data/presets/presets/piste/nordic.json
@@ -13,11 +13,11 @@
         "area"
     ],
     "terms": [
-        "crosscountry",
+        "ski",
         "nordic",
-        "piste",
+        "crosscountry",
         "skating",
-        "ski"
+        "piste"
     ],
     "tags": {
         "piste:type": "nordic"
diff --git a/data/presets/presets/piste/piste.json b/data/presets/presets/piste/piste.json
index e97c2eb81..72b40659d 100644
--- a/data/presets/presets/piste/piste.json
+++ b/data/presets/presets/piste/piste.json
@@ -13,26 +13,26 @@
         "area"
     ],
     "terms": [
-        "alpine",
+        "ski",
+        "nordic",
         "crosscountry",
         "downhill",
-        "horse",
-        "husky",
-        "ice",
-        "luge",
-        "nordic",
-        "skating",
-        "ski",
-        "ski touring",
-        "ski-joring",
-        "skitour",
-        "sled",
-        "sledge",
-        "sleigh",
+        "alpine",
         "snowboard",
+        "skitour",
+        "ski touring",
+        "sled",
+        "luge",
+        "sleigh",
+        "sledge",
+        "ski-joring",
+        "husky",
+        "horse",
+        "winter hiking",
         "snowshoe",
         "snowshoeing",
-        "winter hiking"
+        "ice",
+        "skating"
     ],
     "tags": {
         "piste:type": "*"
diff --git a/data/presets/presets/piste/skitour.json b/data/presets/presets/piste/skitour.json
index 2d43167fe..aaaf5c7b4 100644
--- a/data/presets/presets/piste/skitour.json
+++ b/data/presets/presets/piste/skitour.json
@@ -13,11 +13,11 @@
         "area"
     ],
     "terms": [
-        "crosscountry",
-        "piste",
         "ski",
+        "skitour",
+        "crosscountry",
         "ski touring",
-        "skitour"
+        "piste"
     ],
     "tags": {
         "piste:type": "skitour"
diff --git a/data/presets/presets/piste/sled.json b/data/presets/presets/piste/sled.json
index 1411f19ef..12bd6cb71 100644
--- a/data/presets/presets/piste/sled.json
+++ b/data/presets/presets/piste/sled.json
@@ -13,12 +13,12 @@
         "area"
     ],
     "terms": [
-        "luge",
-        "piste",
         "ski",
         "sled",
+        "luge",
+        "sleigh",
         "sledge",
-        "sleigh"
+        "piste"
     ],
     "tags": {
         "piste:type": "sled"
diff --git a/data/presets/presets/piste/sleigh.json b/data/presets/presets/piste/sleigh.json
index b92a75397..061b4e412 100644
--- a/data/presets/presets/piste/sleigh.json
+++ b/data/presets/presets/piste/sleigh.json
@@ -13,15 +13,15 @@
         "area"
     ],
     "terms": [
-        "horse",
-        "husky",
-        "luge",
-        "piste",
         "ski",
-        "ski-joring",
+        "piste",
         "sled",
+        "luge",
+        "sleigh",
         "sledge",
-        "sleigh"
+        "ski-joring",
+        "husky",
+        "horse"
     ],
     "tags": {
         "piste:type": "sleigh"
diff --git a/data/presets/presets/place/plot.json b/data/presets/presets/place/plot.json
index c5260673c..b1b7b0c26 100644
--- a/data/presets/presets/place/plot.json
+++ b/data/presets/presets/place/plot.json
@@ -11,10 +11,10 @@
         "place": "plot"
     },
     "terms": [
+        "tract",
         "land",
         "lot",
-        "parcel",
-        "tract"
+        "parcel"
     ],
     "name": "Plot"
 }
diff --git a/data/presets/presets/power/generator/source/hydro.json b/data/presets/presets/power/generator/source/hydro.json
index eb0c60751..5d628afa0 100644
--- a/data/presets/presets/power/generator/source/hydro.json
+++ b/data/presets/presets/power/generator/source/hydro.json
@@ -18,8 +18,8 @@
     ],
     "terms": [
         "dam",
-        "francis turbine",
         "generator",
+        "francis turbine",
         "hydroelectricity",
         "kaplan turbine",
         "pelton turbine"
diff --git a/data/presets/presets/power/generator/source/wind.json b/data/presets/presets/power/generator/source/wind.json
index b24142361..e76d0c037 100644
--- a/data/presets/presets/power/generator/source/wind.json
+++ b/data/presets/presets/power/generator/source/wind.json
@@ -18,8 +18,8 @@
     "terms": [
         "generator",
         "turbine",
-        "wind",
-        "windmill"
+        "windmill",
+        "wind"
     ],
     "tags": {
         "power": "generator",
diff --git a/data/presets/presets/power/line.json b/data/presets/presets/power/line.json
index a01eeb0b2..82fb01aa7 100644
--- a/data/presets/presets/power/line.json
+++ b/data/presets/presets/power/line.json
@@ -12,8 +12,8 @@
     ],
     "terms": [
         "electric power transmission line",
-        "high tension line",
-        "high voltage line"
+        "high voltage line",
+        "high tension line"
     ],
     "tags": {
         "power": "line"
diff --git a/data/presets/presets/public_transport/platform/_light_rail_point.json b/data/presets/presets/public_transport/platform/_light_rail_point.json
index 2f377df78..5fdc12635 100644
--- a/data/presets/presets/public_transport/platform/_light_rail_point.json
+++ b/data/presets/presets/public_transport/platform/_light_rail_point.json
@@ -26,9 +26,9 @@
         "rail",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "searchable": false,
     "name": "Light Rail Stop / Platform"
diff --git a/data/presets/presets/public_transport/platform/light_rail.json b/data/presets/presets/public_transport/platform/light_rail.json
index e149bf34e..70f516298 100644
--- a/data/presets/presets/public_transport/platform/light_rail.json
+++ b/data/presets/presets/public_transport/platform/light_rail.json
@@ -32,9 +32,9 @@
         "rail",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Light Rail Platform"
 }
diff --git a/data/presets/presets/public_transport/platform/tram.json b/data/presets/presets/public_transport/platform/tram.json
index c7a7906c2..9fb5d0a51 100644
--- a/data/presets/presets/public_transport/platform/tram.json
+++ b/data/presets/presets/public_transport/platform/tram.json
@@ -33,9 +33,9 @@
         "streetcar",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Tram Platform"
 }
diff --git a/data/presets/presets/public_transport/platform/tram_point.json b/data/presets/presets/public_transport/platform/tram_point.json
index fd34f6b85..fe6a700a3 100644
--- a/data/presets/presets/public_transport/platform/tram_point.json
+++ b/data/presets/presets/public_transport/platform/tram_point.json
@@ -27,9 +27,9 @@
         "streetcar",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Tram Stop / Platform"
 }
diff --git a/data/presets/presets/public_transport/platform/trolleybus.json b/data/presets/presets/public_transport/platform/trolleybus.json
index 1625dba3e..cdef6c351 100644
--- a/data/presets/presets/public_transport/platform/trolleybus.json
+++ b/data/presets/presets/public_transport/platform/trolleybus.json
@@ -27,9 +27,9 @@
         "streetcar",
         "trackless",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Trolleybus Platform"
 }
diff --git a/data/presets/presets/public_transport/platform/trolleybus_point.json b/data/presets/presets/public_transport/platform/trolleybus_point.json
index 59217386f..1ba266535 100644
--- a/data/presets/presets/public_transport/platform/trolleybus_point.json
+++ b/data/presets/presets/public_transport/platform/trolleybus_point.json
@@ -32,9 +32,9 @@
         "streetcar",
         "trackless",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Trolleybus Stop"
 }
diff --git a/data/presets/presets/public_transport/station.json b/data/presets/presets/public_transport/station.json
index c3fc82592..8bad0f7dc 100644
--- a/data/presets/presets/public_transport/station.json
+++ b/data/presets/presets/public_transport/station.json
@@ -10,13 +10,13 @@
     ],
     "moreFields": [
         "air_conditioning",
-        "email",
-        "fax",
         "internet_access/fee",
         "internet_access/ssid",
         "level",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/public_transport/station_light_rail.json b/data/presets/presets/public_transport/station_light_rail.json
index 1bc48b727..18d4953b6 100644
--- a/data/presets/presets/public_transport/station_light_rail.json
+++ b/data/presets/presets/public_transport/station_light_rail.json
@@ -34,9 +34,9 @@
         "terminal",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Light Rail Station"
 }
diff --git a/data/presets/presets/public_transport/station_tram.json b/data/presets/presets/public_transport/station_tram.json
index 376b93b73..3919d7401 100644
--- a/data/presets/presets/public_transport/station_tram.json
+++ b/data/presets/presets/public_transport/station_tram.json
@@ -29,9 +29,9 @@
         "terminal",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Tram Station"
 }
diff --git a/data/presets/presets/public_transport/station_trolleybus.json b/data/presets/presets/public_transport/station_trolleybus.json
index cf105d66e..dcbdd4f8a 100644
--- a/data/presets/presets/public_transport/station_trolleybus.json
+++ b/data/presets/presets/public_transport/station_trolleybus.json
@@ -33,9 +33,9 @@
         "terminal",
         "trackless",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Trolleybus Station / Terminal"
 }
diff --git a/data/presets/presets/public_transport/stop_position_light_rail.json b/data/presets/presets/public_transport/stop_position_light_rail.json
index fdf882ae0..0c5b7ee3c 100644
--- a/data/presets/presets/public_transport/stop_position_light_rail.json
+++ b/data/presets/presets/public_transport/stop_position_light_rail.json
@@ -30,9 +30,9 @@
         "rail",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Light Rail Stopping Location"
 }
diff --git a/data/presets/presets/public_transport/stop_position_tram.json b/data/presets/presets/public_transport/stop_position_tram.json
index 5e1be6712..0902a7eae 100644
--- a/data/presets/presets/public_transport/stop_position_tram.json
+++ b/data/presets/presets/public_transport/stop_position_tram.json
@@ -31,9 +31,9 @@
         "streetcar",
         "track",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Tram Stopping Location"
 }
diff --git a/data/presets/presets/public_transport/stop_position_trolleybus.json b/data/presets/presets/public_transport/stop_position_trolleybus.json
index 45f2f7241..fc7b8a98a 100644
--- a/data/presets/presets/public_transport/stop_position_trolleybus.json
+++ b/data/presets/presets/public_transport/stop_position_trolleybus.json
@@ -25,9 +25,9 @@
         "streetcar",
         "trackless",
         "tram",
+        "trolley",
         "transit",
-        "transportation",
-        "trolley"
+        "transportation"
     ],
     "name": "Trolleybus Stopping Location"
 }
diff --git a/data/presets/presets/railway/_halt.json b/data/presets/presets/railway/_halt.json
index 68d0aeec3..80f85c5a5 100644
--- a/data/presets/presets/railway/_halt.json
+++ b/data/presets/presets/railway/_halt.json
@@ -10,9 +10,9 @@
     "terms": [
         "break",
         "interrupt",
-        "interruption",
         "rest",
-        "wait"
+        "wait",
+        "interruption"
     ],
     "name": "Train Station (Halt / Request)",
     "searchable": false
diff --git a/data/presets/presets/railway/_station.json b/data/presets/presets/railway/_station.json
index 3f995d51c..cba195e16 100644
--- a/data/presets/presets/railway/_station.json
+++ b/data/presets/presets/railway/_station.json
@@ -19,8 +19,8 @@
         "railway": "station"
     },
     "terms": [
-        "station",
-        "train station"
+        "train station",
+        "station"
     ],
     "matchScore": 0.95,
     "name": "Train Station",
diff --git a/data/presets/presets/railway/buffer_stop.json b/data/presets/presets/railway/buffer_stop.json
index 1c8ae1027..bfd73e6ca 100644
--- a/data/presets/presets/railway/buffer_stop.json
+++ b/data/presets/presets/railway/buffer_stop.json
@@ -7,9 +7,9 @@
         "railway": "buffer_stop"
     },
     "terms": [
-        "buffer",
+        "stop",
         "halt",
-        "stop"
+        "buffer"
     ],
     "name": "Buffer Stop"
 }
diff --git a/data/presets/presets/railway/crossing.json b/data/presets/presets/railway/crossing.json
index d635dde86..d170c4c26 100644
--- a/data/presets/presets/railway/crossing.json
+++ b/data/presets/presets/railway/crossing.json
@@ -8,11 +8,11 @@
     },
     "terms": [
         "crossing",
-        "grade crossing",
-        "level crossing",
-        "path through railroad",
         "pedestrian crossing",
         "railroad crossing",
+        "level crossing",
+        "grade crossing",
+        "path through railroad",
         "train crossing"
     ],
     "name": "Railway Crossing (Path)"
diff --git a/data/presets/presets/railway/funicular.json b/data/presets/presets/railway/funicular.json
index 5e24a54cb..ee193b5e7 100644
--- a/data/presets/presets/railway/funicular.json
+++ b/data/presets/presets/railway/funicular.json
@@ -14,11 +14,11 @@
         "line"
     ],
     "terms": [
+        "venicular",
+        "cliff railway",
         "cable car",
         "cable railway",
-        "cliff railway",
-        "funicular railway",
-        "venicular"
+        "funicular railway"
     ],
     "tags": {
         "railway": "funicular"
diff --git a/data/presets/presets/railway/level_crossing.json b/data/presets/presets/railway/level_crossing.json
index e60e3ff75..7bcd19d22 100644
--- a/data/presets/presets/railway/level_crossing.json
+++ b/data/presets/presets/railway/level_crossing.json
@@ -8,9 +8,9 @@
     },
     "terms": [
         "crossing",
-        "grade crossing",
-        "level crossing",
         "railroad crossing",
+        "level crossing",
+        "grade crossing",
         "road through railroad",
         "train crossing"
     ],
diff --git a/data/presets/presets/railway/milestone.json b/data/presets/presets/railway/milestone.json
index 12a636664..17b64377a 100644
--- a/data/presets/presets/railway/milestone.json
+++ b/data/presets/presets/railway/milestone.json
@@ -12,8 +12,8 @@
         "railway": "milestone"
     },
     "terms": [
-        "marker",
-        "milestone"
+        "milestone",
+        "marker"
     ],
     "name": "Railway Milestone"
 }
diff --git a/data/presets/presets/railway/miniature.json b/data/presets/presets/railway/miniature.json
index 8339bcbcc..2c1eb0110 100644
--- a/data/presets/presets/railway/miniature.json
+++ b/data/presets/presets/railway/miniature.json
@@ -20,9 +20,9 @@
         "railway": "miniature"
     },
     "terms": [
-        "minimum gauge railway",
+        "rideable miniature railway",
         "narrow gauge railway",
-        "rideable miniature railway"
+        "minimum gauge railway"
     ],
     "name": "Miniature Railway"
 }
diff --git a/data/presets/presets/railway/narrow_gauge.json b/data/presets/presets/railway/narrow_gauge.json
index e4dedb9ce..9ac8979d8 100644
--- a/data/presets/presets/railway/narrow_gauge.json
+++ b/data/presets/presets/railway/narrow_gauge.json
@@ -16,8 +16,8 @@
         "railway": "narrow_gauge"
     },
     "terms": [
-        "narrow gauge railroad",
-        "narrow gauge railway"
+        "narrow gauge railway",
+        "narrow gauge railroad"
     ],
     "name": "Narrow Gauge Rail"
 }
diff --git a/data/presets/presets/railway/signal.json b/data/presets/presets/railway/signal.json
index 9266cd51a..83f56eea2 100644
--- a/data/presets/presets/railway/signal.json
+++ b/data/presets/presets/railway/signal.json
@@ -13,8 +13,8 @@
         "railway": "signal"
     },
     "terms": [
-        "lights",
-        "signal"
+        "signal",
+        "lights"
     ],
     "name": "Railway Signal"
 }
diff --git a/data/presets/presets/railway/switch.json b/data/presets/presets/railway/switch.json
index 523a1d4a8..d5d6d8bad 100644
--- a/data/presets/presets/railway/switch.json
+++ b/data/presets/presets/railway/switch.json
@@ -7,8 +7,8 @@
         "railway": "switch"
     },
     "terms": [
-        "points",
-        "switch"
+        "switch",
+        "points"
     ],
     "name": "Railway Switch"
 }
diff --git a/data/presets/presets/railway/train_wash.json b/data/presets/presets/railway/train_wash.json
index ece164ec1..2eb2b0d36 100644
--- a/data/presets/presets/railway/train_wash.json
+++ b/data/presets/presets/railway/train_wash.json
@@ -13,8 +13,8 @@
         "railway": "wash"
     },
     "terms": [
-        "clean",
-        "wash"
+        "wash",
+        "clean"
     ],
     "name": "Train Wash"
 }
diff --git a/data/presets/presets/seamark/beacon_isolated_danger.json b/data/presets/presets/seamark/beacon_isolated_danger.json
index 2b555bd58..0df363aab 100644
--- a/data/presets/presets/seamark/beacon_isolated_danger.json
+++ b/data/presets/presets/seamark/beacon_isolated_danger.json
@@ -11,8 +11,8 @@
     ],
     "terms": [
         "beacon isolated danger",
-        "iala",
-        "isolated danger beacon"
+    	"isolated danger beacon",
+        "iala"
     ],
     "tags": {
         "seamark:type": "beacon_isolated_danger"
diff --git a/data/presets/presets/seamark/beacon_lateral.json b/data/presets/presets/seamark/beacon_lateral.json
index 9747ec9b4..086692993 100644
--- a/data/presets/presets/seamark/beacon_lateral.json
+++ b/data/presets/presets/seamark/beacon_lateral.json
@@ -13,11 +13,11 @@
         "vertex"
     ],
     "terms": [
-        "beacon lateral",
-        "cevni",
-        "channel marker",
-        "iala",
         "lateral beacon",
+    	"beacon lateral",
+    	"cevni",
+     	"channel marker",
+        "iala",
         "lateral mark"
     ],
     "tags": {
diff --git a/data/presets/presets/seamark/buoy_lateral.json b/data/presets/presets/seamark/buoy_lateral.json
index daa04877d..a1f6775ec 100644
--- a/data/presets/presets/seamark/buoy_lateral.json
+++ b/data/presets/presets/seamark/buoy_lateral.json
@@ -13,11 +13,11 @@
         "vertex"
     ],
     "terms": [
-        "buoy lateral",
-        "cevni",
-        "channel marker",
-        "iala",
         "lateral buoy",
+    	"buoy lateral",
+	 	"cevni",
+     	"channel marker",
+        "iala",
         "lateral mark"
     ],
     "tags": {
diff --git a/data/presets/presets/seamark/buoy_lateral/green.json b/data/presets/presets/seamark/buoy_lateral/green.json
index a195da6fd..362b83714 100644
--- a/data/presets/presets/seamark/buoy_lateral/green.json
+++ b/data/presets/presets/seamark/buoy_lateral/green.json
@@ -4,11 +4,11 @@
         "vertex"
     ],
     "terms": [
-        "buoy lateral",
-        "cevni",
-        "channel marker",
-        "iala",
         "lateral buoy",
+    	"buoy lateral",
+	 	"cevni",
+     	"channel marker",
+        "iala",
         "lateral mark"
     ],
     "tags": {
diff --git a/data/presets/presets/seamark/buoy_lateral/red.json b/data/presets/presets/seamark/buoy_lateral/red.json
index e6553ce44..851cf7e85 100644
--- a/data/presets/presets/seamark/buoy_lateral/red.json
+++ b/data/presets/presets/seamark/buoy_lateral/red.json
@@ -4,11 +4,11 @@
         "vertex"
     ],
     "terms": [
-        "buoy lateral",
-        "cevni",
-        "channel marker",
-        "iala",
         "lateral buoy",
+    	"buoy lateral",
+	 	"cevni",
+     	"channel marker",
+        "iala",
         "lateral mark"
     ],
     "tags": {
diff --git a/data/presets/presets/seamark/mooring.json b/data/presets/presets/seamark/mooring.json
index 6e1870c4c..1b2e946c1 100644
--- a/data/presets/presets/seamark/mooring.json
+++ b/data/presets/presets/seamark/mooring.json
@@ -9,11 +9,11 @@
         "point"
     ],
     "terms": [
-        "bollard",
-        "buoy",
-        "dolphin",
-        "pile",
-        "post"
+    	"dolphin",
+    	"pile",
+    	"bollard",
+    	"buoy",
+    	"post"
     ],
     "tags": {
         "seamark:type": "mooring"
diff --git a/data/presets/presets/shop/agrarian.json b/data/presets/presets/shop/agrarian.json
index 17dead1f0..750425780 100644
--- a/data/presets/presets/shop/agrarian.json
+++ b/data/presets/presets/shop/agrarian.json
@@ -11,10 +11,10 @@
     "terms": [
         "agricultural inputs",
         "agricultural machines",
-        "agricultural tools",
-        "fertilizer",
+        "seeds",
         "pesticides",
-        "seeds"
+        "fertilizer",
+        "agricultural tools"
     ],
     "tags": {
         "shop": "agrarian"
diff --git a/data/presets/presets/shop/anime.json b/data/presets/presets/shop/anime.json
index 5c37a750a..fe63744d1 100644
--- a/data/presets/presets/shop/anime.json
+++ b/data/presets/presets/shop/anime.json
@@ -8,11 +8,11 @@
         "shop": "anime"
     },
     "terms": [
-        "cosplay",
-        "dakimakura",
-        "figurine",
+        "manga",
         "japan",
-        "manga"
+        "cosplay",
+        "figurine",
+        "dakimakura"
     ],
     "name": "Anime Shop"
 }
diff --git a/data/presets/presets/shop/beauty.json b/data/presets/presets/shop/beauty.json
index 47cece79d..b4b695856 100644
--- a/data/presets/presets/shop/beauty.json
+++ b/data/presets/presets/shop/beauty.json
@@ -9,8 +9,8 @@
         "area"
     ],
     "terms": [
-        "salon",
         "spa",
+        "salon",
         "tanning"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/butcher.json b/data/presets/presets/shop/butcher.json
index 99164f42e..d88db35fc 100644
--- a/data/presets/presets/shop/butcher.json
+++ b/data/presets/presets/shop/butcher.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "beef",
         "chicken",
+        "beef",
         "lamb",
         "meat",
         "pork"
diff --git a/data/presets/presets/shop/charity.json b/data/presets/presets/shop/charity.json
index 6b5164169..051577cc1 100644
--- a/data/presets/presets/shop/charity.json
+++ b/data/presets/presets/shop/charity.json
@@ -9,9 +9,9 @@
         "area"
     ],
     "terms": [
-        "nonprofit",
+        "thrift",
         "op shop",
-        "thrift"
+        "nonprofit"
     ],
     "tags": {
         "shop": "charity"
diff --git a/data/presets/presets/shop/clothes/underwear.json b/data/presets/presets/shop/clothes/underwear.json
index d73c5bc38..65b1cb55c 100644
--- a/data/presets/presets/shop/clothes/underwear.json
+++ b/data/presets/presets/shop/clothes/underwear.json
@@ -14,10 +14,10 @@
     },
     "terms": [
         "boutique",
-        "boxers",
         "bras",
         "brassieres",
         "briefs",
+        "boxers",
         "fashion",
         "lingerie",
         "panties",
diff --git a/data/presets/presets/shop/computer.json b/data/presets/presets/shop/computer.json
index 47efd971e..ede822819 100644
--- a/data/presets/presets/shop/computer.json
+++ b/data/presets/presets/shop/computer.json
@@ -9,8 +9,8 @@
     },
     "terms": [
         "desktop",
-        "hardware",
         "laptop",
+        "hardware",
         "operating system",
         "software"
     ],
diff --git a/data/presets/presets/shop/craft.json b/data/presets/presets/shop/craft.json
index b98b710c8..7225201c9 100644
--- a/data/presets/presets/shop/craft.json
+++ b/data/presets/presets/shop/craft.json
@@ -9,8 +9,8 @@
     },
     "terms": [
         "art*",
-        "frame",
-        "paint*"
+        "paint*",
+        "frame"
     ],
     "name": "Arts and Crafts Store"
 }
diff --git a/data/presets/presets/shop/dairy.json b/data/presets/presets/shop/dairy.json
index 75bce3361..b00b17270 100644
--- a/data/presets/presets/shop/dairy.json
+++ b/data/presets/presets/shop/dairy.json
@@ -5,9 +5,9 @@
         "area"
     ],
     "terms": [
-        "cheese",
+        "milk",
         "egg",
-        "milk"
+        "cheese"
     ],
     "tags": {
         "shop": "dairy"
diff --git a/data/presets/presets/shop/erotic.json b/data/presets/presets/shop/erotic.json
index 1d14a4217..cfa6060d0 100644
--- a/data/presets/presets/shop/erotic.json
+++ b/data/presets/presets/shop/erotic.json
@@ -9,8 +9,8 @@
         "area"
     ],
     "terms": [
-        "porn",
-        "sex"
+        "sex",
+        "porn"
     ],
     "tags": {
         "shop": "erotic"
diff --git a/data/presets/presets/shop/erotic/lgbtq.json b/data/presets/presets/shop/erotic/lgbtq.json
index 3c95f70ad..4cb57ca3b 100644
--- a/data/presets/presets/shop/erotic/lgbtq.json
+++ b/data/presets/presets/shop/erotic/lgbtq.json
@@ -5,8 +5,8 @@
         "area"
     ],
     "terms": [
-        "porn",
-        "sex"
+        "sex",
+        "porn"
     ],
     "tags": {
         "shop": "erotic",
diff --git a/data/presets/presets/shop/fireplace.json b/data/presets/presets/shop/fireplace.json
index c0a61bd2e..2e67a8dcc 100644
--- a/data/presets/presets/shop/fireplace.json
+++ b/data/presets/presets/shop/fireplace.json
@@ -6,8 +6,8 @@
     ],
     "terms": [
         "fireplace",
-        "masonry heater",
-        "stove"
+        "stove",
+        "masonry heater"
     ],
     "tags": {
         "shop": "fireplace"
diff --git a/data/presets/presets/shop/frame.json b/data/presets/presets/shop/frame.json
index 0d08d10b6..50f5948f5 100644
--- a/data/presets/presets/shop/frame.json
+++ b/data/presets/presets/shop/frame.json
@@ -9,9 +9,9 @@
     },
     "terms": [
         "art*",
-        "frame",
         "paint*",
-        "photo*"
+        "photo*",
+        "frame"
     ],
     "name": "Framing Shop"
 }
diff --git a/data/presets/presets/shop/funeral_directors.json b/data/presets/presets/shop/funeral_directors.json
index a5ab2e9e5..44cb64dc4 100644
--- a/data/presets/presets/shop/funeral_directors.json
+++ b/data/presets/presets/shop/funeral_directors.json
@@ -10,8 +10,8 @@
         "area"
     ],
     "terms": [
-        "memorial home",
-        "undertaker"
+        "undertaker",
+        "memorial home"
     ],
     "tags": {
         "shop": "funeral_directors"
diff --git a/data/presets/presets/shop/general.json b/data/presets/presets/shop/general.json
index c30b1c6de..07c330e21 100644
--- a/data/presets/presets/shop/general.json
+++ b/data/presets/presets/shop/general.json
@@ -7,8 +7,6 @@
     "tags": {
         "shop": "general"
     },
-    "terms": [
-        "Village Shop"
-    ],
+    "terms": ["Village Shop"],
     "name": "General Store"
 }
diff --git a/data/presets/presets/shop/hairdresser_supply.json b/data/presets/presets/shop/hairdresser_supply.json
index 8aad3b67e..0e484c96e 100644
--- a/data/presets/presets/shop/hairdresser_supply.json
+++ b/data/presets/presets/shop/hairdresser_supply.json
@@ -6,8 +6,8 @@
     ],
     "terms": [
         "barber",
-        "conditioner",
-        "shampoo"
+        "shampoo",
+        "conditioner"
     ],
     "tags": {
         "shop": "hairdresser_supply"
diff --git a/data/presets/presets/shop/health_food.json b/data/presets/presets/shop/health_food.json
index 773328d59..762ac75eb 100644
--- a/data/presets/presets/shop/health_food.json
+++ b/data/presets/presets/shop/health_food.json
@@ -5,10 +5,10 @@
         "area"
     ],
     "terms": [
-        "vegan",
-        "vegetarian",
+        "wholefood",
         "vitamins",
-        "wholefood"
+        "vegetarian",
+        "vegan"
     ],
     "tags": {
         "shop": "health_food"
diff --git a/data/presets/presets/shop/hobby.json b/data/presets/presets/shop/hobby.json
index a4797e642..2d06d06ca 100644
--- a/data/presets/presets/shop/hobby.json
+++ b/data/presets/presets/shop/hobby.json
@@ -8,8 +8,8 @@
         "shop": "hobby"
     },
     "terms": [
-        "figurine",
         "manga",
+        "figurine",
         "model"
     ],
     "name": "Hobby Shop"
diff --git a/data/presets/presets/shop/jewelry.json b/data/presets/presets/shop/jewelry.json
index 10c147ed4..e993cd025 100644
--- a/data/presets/presets/shop/jewelry.json
+++ b/data/presets/presets/shop/jewelry.json
@@ -11,8 +11,8 @@
         "gem",
         "gold",
         "jeweler",
-        "jeweller",
         "jewellery",
+        "jeweller",
         "necklace",
         "pins",
         "ring",
diff --git a/data/presets/presets/shop/laundry/self_service.json b/data/presets/presets/shop/laundry/self_service.json
index 41c7105a1..27557f243 100644
--- a/data/presets/presets/shop/laundry/self_service.json
+++ b/data/presets/presets/shop/laundry/self_service.json
@@ -10,9 +10,9 @@
     },
     "terms": [
         "Coin Laundry",
+        "Laundromat",
         "Coin Wash",
         "Launderette",
-        "Laundromat",
         "Washateria"
     ],
     "name": "Self-Service Laundry"
diff --git a/data/presets/presets/shop/military_surplus.json b/data/presets/presets/shop/military_surplus.json
index f7859315c..6b180074d 100644
--- a/data/presets/presets/shop/military_surplus.json
+++ b/data/presets/presets/shop/military_surplus.json
@@ -6,8 +6,8 @@
     ],
     "terms": [
         "armor",
-        "army surplus",
         "army-navy store",
+        "army surplus",
         "navy surplus",
         "tactical gear",
         "war surplus shop",
diff --git a/data/presets/presets/shop/music.json b/data/presets/presets/shop/music.json
index 9c23e9752..0a8b57eb9 100644
--- a/data/presets/presets/shop/music.json
+++ b/data/presets/presets/shop/music.json
@@ -5,9 +5,9 @@
         "area"
     ],
     "terms": [
+        "tape casettes",
         "CDs",
         "compact discs",
-        "tape casettes",
         "vinyl records"
     ],
     "tags": {
diff --git a/data/presets/presets/shop/outdoor.json b/data/presets/presets/shop/outdoor.json
index f69c929b4..c8551ace0 100644
--- a/data/presets/presets/shop/outdoor.json
+++ b/data/presets/presets/shop/outdoor.json
@@ -12,9 +12,9 @@
         "camping",
         "climbing",
         "hiking",
+        "outfitter",
         "outdoor equipment",
-        "outdoor supplies",
-        "outfitter"
+        "outdoor supplies"
     ],
     "tags": {
         "shop": "outdoor"
diff --git a/data/presets/presets/shop/pastry.json b/data/presets/presets/shop/pastry.json
index 01826961e..b8595e06c 100644
--- a/data/presets/presets/shop/pastry.json
+++ b/data/presets/presets/shop/pastry.json
@@ -8,9 +8,9 @@
         "shop": "pastry"
     },
     "terms": [
+        "patisserie",
         "cake shop",
-        "cakery",
-        "patisserie"
+        "cakery"
     ],
     "name": "Pastry Shop"
 }
diff --git a/data/presets/presets/shop/second_hand.json b/data/presets/presets/shop/second_hand.json
index 824af1440..f814f4e59 100644
--- a/data/presets/presets/shop/second_hand.json
+++ b/data/presets/presets/shop/second_hand.json
@@ -9,9 +9,9 @@
         "area"
     ],
     "terms": [
-        "resale",
-        "second hand",
         "secondhand",
+        "second hand",
+        "resale",
         "thrift",
         "used"
     ],
diff --git a/data/presets/presets/shop/supermarket.json b/data/presets/presets/shop/supermarket.json
index ce71191bb..2a056da7b 100644
--- a/data/presets/presets/shop/supermarket.json
+++ b/data/presets/presets/shop/supermarket.json
@@ -1,8 +1,8 @@
 {
     "icon": "maki-grocery",
     "moreFields": [
-        "{shop}",
-        "diet_multi"
+        "diet_multi",
+        "{shop}"
     ],
     "geometry": [
         "point",
@@ -10,8 +10,8 @@
     ],
     "terms": [
         "grocery",
-        "shop",
-        "store"
+        "store",
+        "shop"
     ],
     "tags": {
         "shop": "supermarket"
diff --git a/data/presets/presets/shop/wholesale.json b/data/presets/presets/shop/wholesale.json
index 7e495d1cf..922ea03d2 100644
--- a/data/presets/presets/shop/wholesale.json
+++ b/data/presets/presets/shop/wholesale.json
@@ -9,8 +9,8 @@
         "area"
     ],
     "terms": [
-        "cash and carry",
-        "warehouse club"
+        "warehouse club",
+        "cash and carry"
     ],
     "tags": {
         "shop": "wholesale"
diff --git a/data/presets/presets/telecom/data_center.json b/data/presets/presets/telecom/data_center.json
index 6e34be930..bd85e2f53 100644
--- a/data/presets/presets/telecom/data_center.json
+++ b/data/presets/presets/telecom/data_center.json
@@ -22,8 +22,8 @@
         "computer systems storage",
         "information technology",
         "server farm",
-        "telecommunications",
-        "the cloud"
+        "the cloud",
+        "telecommunications"
     ],
     "name": "Data Center"
 }
diff --git a/data/presets/presets/tourism/alpine_hut.json b/data/presets/presets/tourism/alpine_hut.json
index 75fa63a66..6d8281160 100644
--- a/data/presets/presets/tourism/alpine_hut.json
+++ b/data/presets/presets/tourism/alpine_hut.json
@@ -11,7 +11,7 @@
         "payment_multi_fee",
         "charge_fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "email",
         "fax",
         "internet_access/ssid",
diff --git a/data/presets/presets/tourism/apartment.json b/data/presets/presets/tourism/apartment.json
index da35f53b0..79f7eac5c 100644
--- a/data/presets/presets/tourism/apartment.json
+++ b/data/presets/presets/tourism/apartment.json
@@ -9,11 +9,11 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "building/levels_building",
+        "height_building",
         "email",
         "fax",
-        "height_building",
         "internet_access/ssid",
         "level",
         "payment_multi",
diff --git a/data/presets/presets/tourism/aquarium.json b/data/presets/presets/tourism/aquarium.json
index edc8b1392..097908c2c 100644
--- a/data/presets/presets/tourism/aquarium.json
+++ b/data/presets/presets/tourism/aquarium.json
@@ -9,16 +9,16 @@
     ],
     "moreFields": [
         "charge_fee",
-        "email",
-        "fax",
         "fee",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi_fee",
-        "phone",
         "smoking",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/artwork/bust.json b/data/presets/presets/tourism/artwork/bust.json
index dedaa4b21..78c63c016 100644
--- a/data/presets/presets/tourism/artwork/bust.json
+++ b/data/presets/presets/tourism/artwork/bust.json
@@ -6,8 +6,7 @@
         "material"
     ],
     "geometry": [
-        "point",
-        "vertex"
+        "point", "vertex"
     ],
     "tags": {
         "tourism": "artwork",
diff --git a/data/presets/presets/tourism/artwork/graffiti.json b/data/presets/presets/tourism/artwork/graffiti.json
index 0c1475071..bee56d6b1 100644
--- a/data/presets/presets/tourism/artwork/graffiti.json
+++ b/data/presets/presets/tourism/artwork/graffiti.json
@@ -18,9 +18,9 @@
         "key": "artwork_type"
     },
     "terms": [
-        "Graffiti Artwork",
+        "Street Artwork",
         "Guerilla Artwork",
-        "Street Artwork"
+        "Graffiti Artwork"
     ],
     "name": "Graffiti"
 }
diff --git a/data/presets/presets/tourism/artwork/sculpture.json b/data/presets/presets/tourism/artwork/sculpture.json
index 822f8d963..7bb073958 100644
--- a/data/presets/presets/tourism/artwork/sculpture.json
+++ b/data/presets/presets/tourism/artwork/sculpture.json
@@ -20,9 +20,9 @@
         "value": "sculpture"
     },
     "terms": [
-        "carving",
+        "statue",
         "figure",
-        "statue"
+        "carving"
     ],
     "name": "Sculpture"
 }
diff --git a/data/presets/presets/tourism/artwork/statue.json b/data/presets/presets/tourism/artwork/statue.json
index 1588fcb86..e81f198e2 100644
--- a/data/presets/presets/tourism/artwork/statue.json
+++ b/data/presets/presets/tourism/artwork/statue.json
@@ -20,9 +20,9 @@
         "value": "statue"
     },
     "terms": [
-        "carving",
+        "sculpture",
         "figure",
-        "sculpture"
+        "carving"
     ],
     "name": "Statue"
 }
diff --git a/data/presets/presets/tourism/camp_pitch.json b/data/presets/presets/tourism/camp_pitch.json
index 880d4e41e..c4ef9734e 100644
--- a/data/presets/presets/tourism/camp_pitch.json
+++ b/data/presets/presets/tourism/camp_pitch.json
@@ -9,8 +9,8 @@
         "area"
     ],
     "terms": [
-        "rv",
-        "tent"
+        "tent",
+        "rv"
     ],
     "tags": {
         "tourism": "camp_pitch"
diff --git a/data/presets/presets/tourism/camp_site.json b/data/presets/presets/tourism/camp_site.json
index eaad0dcc8..e0448cb9b 100644
--- a/data/presets/presets/tourism/camp_site.json
+++ b/data/presets/presets/tourism/camp_site.json
@@ -12,7 +12,7 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "email",
         "fax",
         "internet_access/ssid",
@@ -29,8 +29,8 @@
         "area"
     ],
     "terms": [
-        "rv",
-        "tent"
+        "tent",
+        "rv"
     ],
     "tags": {
         "tourism": "camp_site"
diff --git a/data/presets/presets/tourism/caravan_site.json b/data/presets/presets/tourism/caravan_site.json
index ce14386b1..3ba999620 100644
--- a/data/presets/presets/tourism/caravan_site.json
+++ b/data/presets/presets/tourism/caravan_site.json
@@ -9,19 +9,19 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "charge_fee",
-        "email",
-        "fax",
-        "fee",
-        "internet_access/ssid",
         "operator",
+        "fee",
         "payment_multi_fee",
-        "phone",
-        "reservation",
+        "internet_access/ssid",
         "smoking",
         "website",
-        "wheelchair"
+        "phone",
+        "email",
+        "fax",
+        "wheelchair",
+        "reservation"
     ],
     "geometry": [
         "point",
@@ -29,8 +29,8 @@
         "area"
     ],
     "terms": [
-        "Camper",
-        "Motor Home"
+        "Motor Home",
+        "Camper"
     ],
     "tags": {
         "tourism": "caravan_site"
diff --git a/data/presets/presets/tourism/chalet.json b/data/presets/presets/tourism/chalet.json
index 096004bf1..aa08dbcba 100644
--- a/data/presets/presets/tourism/chalet.json
+++ b/data/presets/presets/tourism/chalet.json
@@ -8,19 +8,19 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "air_conditioning",
         "building/levels_building",
+        "height_building",
+        "smoking",
+        "payment_multi",
+        "internet_access/ssid",
+        "website",
+        "phone",
         "email",
         "fax",
-        "height_building",
-        "internet_access/ssid",
-        "payment_multi",
-        "phone",
-        "reservation",
-        "smoking",
-        "website",
-        "wheelchair"
+        "wheelchair",
+        "reservation"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/gallery.json b/data/presets/presets/tourism/gallery.json
index c63459547..e9e6f328a 100644
--- a/data/presets/presets/tourism/gallery.json
+++ b/data/presets/presets/tourism/gallery.json
@@ -8,14 +8,14 @@
         "opening_hours"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json
index 6b092d3e4..c5d5d861c 100644
--- a/data/presets/presets/tourism/guest_house.json
+++ b/data/presets/presets/tourism/guest_house.json
@@ -10,19 +10,19 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "air_conditioning",
         "building/levels_building",
+        "height_building",
+        "smoking",
+        "payment_multi",
+        "internet_access/ssid",
+        "website",
+        "phone",
         "email",
         "fax",
-        "height_building",
-        "internet_access/ssid",
-        "payment_multi",
-        "phone",
-        "reservation",
-        "smoking",
-        "website",
-        "wheelchair"
+        "wheelchair",
+        "reservation"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/hostel.json b/data/presets/presets/tourism/hostel.json
index 2302fc165..d3dca59dd 100644
--- a/data/presets/presets/tourism/hostel.json
+++ b/data/presets/presets/tourism/hostel.json
@@ -3,7 +3,7 @@
     "fields": [
         "{tourism/guest_house}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{tourism/guest_house}"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/hotel.json b/data/presets/presets/tourism/hotel.json
index c6387f994..20ccd7b1d 100644
--- a/data/presets/presets/tourism/hotel.json
+++ b/data/presets/presets/tourism/hotel.json
@@ -5,8 +5,8 @@
     ],
     "moreFields": [
         "{tourism/motel}",
-        "bar",
-        "stars"
+        "stars",
+        "bar"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/tourism/information/office.json b/data/presets/presets/tourism/information/office.json
index 876a3a15b..675475115 100644
--- a/data/presets/presets/tourism/information/office.json
+++ b/data/presets/presets/tourism/information/office.json
@@ -10,9 +10,9 @@
     ],
     "moreFields": [
         "building/levels_building",
+        "height_building",
         "email",
         "fax",
-        "height_building",
         "internet_access/ssid",
         "phone",
         "website",
diff --git a/data/presets/presets/tourism/motel.json b/data/presets/presets/tourism/motel.json
index 6d8b9a2ad..3cca03a2a 100644
--- a/data/presets/presets/tourism/motel.json
+++ b/data/presets/presets/tourism/motel.json
@@ -9,12 +9,12 @@
         "internet_access",
         "internet_access/fee"
     ],
-    "moreFields": [
+    "moreFields" : [
         "air_conditioning",
         "building/levels_building",
+        "height_building",
         "email",
         "fax",
-        "height_building",
         "internet_access/ssid",
         "operator",
         "payment_multi",
diff --git a/data/presets/presets/tourism/museum.json b/data/presets/presets/tourism/museum.json
index 832d91e41..ee33d19b8 100644
--- a/data/presets/presets/tourism/museum.json
+++ b/data/presets/presets/tourism/museum.json
@@ -12,17 +12,17 @@
         "air_conditioning",
         "building/levels_building",
         "charge_fee",
-        "email",
-        "fax",
-        "fee",
         "height_building",
+        "fee",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "level",
         "payment_multi",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
@@ -32,8 +32,8 @@
     "terms": [
         "art*",
         "exhibit*",
-        "foundation",
         "gallery",
+        "foundation",
         "hall",
         "institution",
         "paint*",
diff --git a/data/presets/presets/tourism/picnic_site.json b/data/presets/presets/tourism/picnic_site.json
index 12f3d3808..6675fce61 100644
--- a/data/presets/presets/tourism/picnic_site.json
+++ b/data/presets/presets/tourism/picnic_site.json
@@ -9,15 +9,15 @@
     ],
     "moreFields": [
         "charge_fee",
-        "fee",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "smoking",
+        "fee",
         "level",
         "payment_multi_fee",
         "phone",
         "reservation",
-        "smoking",
         "website",
         "wheelchair"
     ],
diff --git a/data/presets/presets/tourism/theme_park.json b/data/presets/presets/tourism/theme_park.json
index 199ecb2ce..ecb8c5fd3 100644
--- a/data/presets/presets/tourism/theme_park.json
+++ b/data/presets/presets/tourism/theme_park.json
@@ -7,14 +7,14 @@
         "opening_hours"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/trail_riding_station.json b/data/presets/presets/tourism/trail_riding_station.json
index 74f1de99a..71793a453 100644
--- a/data/presets/presets/tourism/trail_riding_station.json
+++ b/data/presets/presets/tourism/trail_riding_station.json
@@ -7,15 +7,15 @@
         "horse_dressage"
     ],
     "moreFields": [
-        "address",
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
+        "address",
         "opening_hours",
+        "website",
         "phone",
-        "website"
+        "email",
+        "fax"
     ],
     "geometry": [
         "point",
@@ -25,5 +25,5 @@
         "tourism": "trail_riding_station"
     },
     "name": "Trail Riding Station",
-    "matchScore": 2
+    "matchScore": 2.0
 }
diff --git a/data/presets/presets/tourism/wilderness_hut.json b/data/presets/presets/tourism/wilderness_hut.json
index 8bdce8c86..edd05df67 100644
--- a/data/presets/presets/tourism/wilderness_hut.json
+++ b/data/presets/presets/tourism/wilderness_hut.json
@@ -22,9 +22,9 @@
         "area"
     ],
     "terms": [
+        "wilderness hut",
         "backcountry hut",
-        "bothy",
-        "wilderness hut"
+        "bothy"
     ],
     "tags": {
         "tourism": "wilderness_hut"
diff --git a/data/presets/presets/tourism/zoo.json b/data/presets/presets/tourism/zoo.json
index 08686b593..9cda5f2ef 100644
--- a/data/presets/presets/tourism/zoo.json
+++ b/data/presets/presets/tourism/zoo.json
@@ -9,14 +9,14 @@
         "charge_fee"
     ],
     "moreFields": [
-        "email",
-        "fax",
         "internet_access",
         "internet_access/fee",
         "internet_access/ssid",
         "payment_multi",
-        "phone",
         "website",
+        "phone",
+        "email",
+        "fax",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/tourism/zoo/petting.json b/data/presets/presets/tourism/zoo/petting.json
index 0b3ba1823..f8606383f 100644
--- a/data/presets/presets/tourism/zoo/petting.json
+++ b/data/presets/presets/tourism/zoo/petting.json
@@ -13,10 +13,10 @@
         "value": "petting_zoo"
     },
     "terms": [
-        "Children's Farm",
         "Children's Zoo",
-        "farm animals",
-        "Petting Farm"
+        "Children's Farm",
+        "Petting Farm",
+        "farm animals"
     ],
     "name": "Petting Zoo"
 }
diff --git a/data/presets/presets/tourism/zoo/safari.json b/data/presets/presets/tourism/zoo/safari.json
index 56296acfa..47f5839ca 100644
--- a/data/presets/presets/tourism/zoo/safari.json
+++ b/data/presets/presets/tourism/zoo/safari.json
@@ -13,8 +13,8 @@
         "value": "safari_park"
     },
     "terms": [
-        "Drive-In Zoo",
-        "Drive-Through Zoo"
+        "Drive-Through Zoo",
+        "Drive-In Zoo"
     ],
     "name": "Safari Park"
 }
diff --git a/data/presets/presets/traffic_calming/bump.json b/data/presets/presets/traffic_calming/bump.json
index 44c057dd2..25159504b 100644
--- a/data/presets/presets/traffic_calming/bump.json
+++ b/data/presets/presets/traffic_calming/bump.json
@@ -10,8 +10,8 @@
     ],
     "terms": [
         "hump",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "tags": {
         "traffic_calming": "bump"
diff --git a/data/presets/presets/traffic_calming/chicane.json b/data/presets/presets/traffic_calming/chicane.json
index c8a8e0029..f51abe55a 100644
--- a/data/presets/presets/traffic_calming/chicane.json
+++ b/data/presets/presets/traffic_calming/chicane.json
@@ -11,8 +11,8 @@
     ],
     "terms": [
         "driveway link",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "tags": {
         "traffic_calming": "chicane"
diff --git a/data/presets/presets/traffic_calming/choker.json b/data/presets/presets/traffic_calming/choker.json
index 0d3e822fa..8c6882296 100644
--- a/data/presets/presets/traffic_calming/choker.json
+++ b/data/presets/presets/traffic_calming/choker.json
@@ -10,8 +10,8 @@
         "area"
     ],
     "terms": [
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "tags": {
         "traffic_calming": "choker"
diff --git a/data/presets/presets/traffic_calming/cushion.json b/data/presets/presets/traffic_calming/cushion.json
index c69d4bb39..2a3488a7b 100644
--- a/data/presets/presets/traffic_calming/cushion.json
+++ b/data/presets/presets/traffic_calming/cushion.json
@@ -11,8 +11,8 @@
     "terms": [
         "bump",
         "hump",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "tags": {
         "traffic_calming": "cushion"
diff --git a/data/presets/presets/traffic_calming/dip.json b/data/presets/presets/traffic_calming/dip.json
index 8e9b6e50a..62f5c30f0 100644
--- a/data/presets/presets/traffic_calming/dip.json
+++ b/data/presets/presets/traffic_calming/dip.json
@@ -9,8 +9,8 @@
         "line"
     ],
     "terms": [
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "tags": {
         "traffic_calming": "dip"
diff --git a/data/presets/presets/traffic_calming/hump.json b/data/presets/presets/traffic_calming/hump.json
index b58eb0585..e2473861e 100644
--- a/data/presets/presets/traffic_calming/hump.json
+++ b/data/presets/presets/traffic_calming/hump.json
@@ -10,8 +10,8 @@
     ],
     "terms": [
         "bump",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "tags": {
         "traffic_calming": "hump"
diff --git a/data/presets/presets/traffic_calming/rumble_strip.json b/data/presets/presets/traffic_calming/rumble_strip.json
index 8a4f37d31..f0e9848c3 100644
--- a/data/presets/presets/traffic_calming/rumble_strip.json
+++ b/data/presets/presets/traffic_calming/rumble_strip.json
@@ -9,8 +9,8 @@
     ],
     "terms": [
         "audible lines",
-        "growlers",
-        "sleeper lines"
+        "sleeper lines",
+        "growlers"
     ],
     "tags": {
         "traffic_calming": "rumble_strip"
diff --git a/data/presets/presets/traffic_calming/table.json b/data/presets/presets/traffic_calming/table.json
index f3b1d3171..58e1371de 100644
--- a/data/presets/presets/traffic_calming/table.json
+++ b/data/presets/presets/traffic_calming/table.json
@@ -13,8 +13,8 @@
     "terms": [
         "flat top",
         "hump",
-        "slow",
-        "speed"
+        "speed",
+        "slow"
     ],
     "name": "Speed Table"
 }
diff --git a/data/presets/presets/traffic_sign.json b/data/presets/presets/traffic_sign.json
index af1c609b1..423d66e76 100644
--- a/data/presets/presets/traffic_sign.json
+++ b/data/presets/presets/traffic_sign.json
@@ -11,8 +11,8 @@
         "traffic_sign": "*"
     },
     "terms": [
-        "highway",
-        "road"
+        "road",
+        "highway"
     ],
     "name": "Traffic Sign"
 }
diff --git a/data/presets/presets/traffic_sign/city_limit.json b/data/presets/presets/traffic_sign/city_limit.json
index fa8cd9c8e..bf32228f6 100644
--- a/data/presets/presets/traffic_sign/city_limit.json
+++ b/data/presets/presets/traffic_sign/city_limit.json
@@ -12,14 +12,14 @@
         "traffic_sign": "city_limit"
     },
     "terms": [
-        "border",
+        "town",
+        "village",
+        "hamlet",
         "boundary",
         "edge",
-        "hamlet",
-        "highway",
+        "border",
         "road",
-        "town",
-        "village"
+        "highway"
     ],
     "name": "City Limit Sign"
 }
diff --git a/data/presets/presets/traffic_sign/city_limit_vertex.json b/data/presets/presets/traffic_sign/city_limit_vertex.json
index 04e626786..11c71e054 100644
--- a/data/presets/presets/traffic_sign/city_limit_vertex.json
+++ b/data/presets/presets/traffic_sign/city_limit_vertex.json
@@ -12,14 +12,14 @@
         "traffic_sign": "city_limit"
     },
     "terms": [
-        "border",
+        "town",
+        "village",
+        "hamlet",
         "boundary",
         "edge",
-        "hamlet",
-        "highway",
+        "border",
         "road",
-        "town",
-        "village"
+        "highway"
     ],
     "name": "City Limit Sign"
 }
diff --git a/data/presets/presets/traffic_sign/maxspeed.json b/data/presets/presets/traffic_sign/maxspeed.json
index fe6a174c0..1845a779d 100644
--- a/data/presets/presets/traffic_sign/maxspeed.json
+++ b/data/presets/presets/traffic_sign/maxspeed.json
@@ -12,10 +12,10 @@
         "traffic_sign": "maxspeed"
     },
     "terms": [
-        "highway",
         "max speed",
         "maximum speed",
-        "road"
+        "road",
+        "highway"
     ],
     "name": "Speed Limit Sign"
 }
diff --git a/data/presets/presets/traffic_sign/maxspeed_vertex.json b/data/presets/presets/traffic_sign/maxspeed_vertex.json
index ea400e281..667d3c7d9 100644
--- a/data/presets/presets/traffic_sign/maxspeed_vertex.json
+++ b/data/presets/presets/traffic_sign/maxspeed_vertex.json
@@ -12,10 +12,10 @@
         "traffic_sign": "maxspeed"
     },
     "terms": [
-        "highway",
         "max speed",
         "maximum speed",
-        "road"
+        "road",
+        "highway"
     ],
     "name": "Speed Limit Sign"
 }
diff --git a/data/presets/presets/traffic_sign_vertex.json b/data/presets/presets/traffic_sign_vertex.json
index e0861e5b5..67edd21d8 100644
--- a/data/presets/presets/traffic_sign_vertex.json
+++ b/data/presets/presets/traffic_sign_vertex.json
@@ -11,8 +11,8 @@
         "traffic_sign": "*"
     },
     "terms": [
-        "highway",
-        "road"
+        "road",
+        "highway"
     ],
     "name": "Traffic Sign"
 }
diff --git a/data/presets/presets/type/route/bus.json b/data/presets/presets/type/route/bus.json
index f50c64aae..0a7905da2 100644
--- a/data/presets/presets/type/route/bus.json
+++ b/data/presets/presets/type/route/bus.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/detour.json b/data/presets/presets/type/route/detour.json
index 0fdfe0cd0..3966df1a9 100644
--- a/data/presets/presets/type/route/detour.json
+++ b/data/presets/presets/type/route/detour.json
@@ -3,7 +3,7 @@
     "fields": [
         "name",
         "ref_route",
-        "to",
+        "to", 
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/ferry.json b/data/presets/presets/type/route/ferry.json
index a2d7862c8..51d262c3e 100644
--- a/data/presets/presets/type/route/ferry.json
+++ b/data/presets/presets/type/route/ferry.json
@@ -3,7 +3,7 @@
     "fields": [
         "{route/ferry}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{route/ferry}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/hiking.json b/data/presets/presets/type/route/hiking.json
index c13f52e71..e53811c2a 100644
--- a/data/presets/presets/type/route/hiking.json
+++ b/data/presets/presets/type/route/hiking.json
@@ -7,7 +7,7 @@
         "network_foot",
         "description",
         "distance",
-        "to",
+        "to", 
         "from"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/light_rail.json b/data/presets/presets/type/route/light_rail.json
index c01c6ba1e..fcc168eb7 100644
--- a/data/presets/presets/type/route/light_rail.json
+++ b/data/presets/presets/type/route/light_rail.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/monorail.json b/data/presets/presets/type/route/monorail.json
index 5f9016fbb..a9f2c6a8c 100644
--- a/data/presets/presets/type/route/monorail.json
+++ b/data/presets/presets/type/route/monorail.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/subway.json b/data/presets/presets/type/route/subway.json
index 695c98937..7806a8194 100644
--- a/data/presets/presets/type/route/subway.json
+++ b/data/presets/presets/type/route/subway.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/train.json b/data/presets/presets/type/route/train.json
index a392297d0..0868434ad 100644
--- a/data/presets/presets/type/route/train.json
+++ b/data/presets/presets/type/route/train.json
@@ -8,11 +8,11 @@
         "to",
         "from"
     ],
-    "moreFields": [
+    "moreFields" : [
         "colour",
-        "duration",
         "interval",
         "opening_hours",
+        "duration",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route/tram.json b/data/presets/presets/type/route/tram.json
index b9355041a..67f56756e 100644
--- a/data/presets/presets/type/route/tram.json
+++ b/data/presets/presets/type/route/tram.json
@@ -3,7 +3,7 @@
     "fields": [
         "{type/route/train}"
     ],
-    "moreFields": [
+    "moreFields" : [
         "{type/route/train}"
     ],
     "geometry": [
diff --git a/data/presets/presets/type/route_master.json b/data/presets/presets/type/route_master.json
index a187d8695..df59e4d6c 100644
--- a/data/presets/presets/type/route_master.json
+++ b/data/presets/presets/type/route_master.json
@@ -7,7 +7,7 @@
         "operator",
         "network"
     ],
-    "moreFields": [
+    "moreFields" : [
         "colour",
         "interval",
         "opening_hours",
diff --git a/data/presets/presets/waterway/boatyard.json b/data/presets/presets/waterway/boatyard.json
index 70b6af834..a32b6353b 100644
--- a/data/presets/presets/waterway/boatyard.json
+++ b/data/presets/presets/waterway/boatyard.json
@@ -1,15 +1,15 @@
 {
-    "icon": "maki-harbor",
-    "fields": [
+     "icon": "maki-harbor",
+     "fields":[
         "name",
         "operator"
     ],
     "moreFields": [
         "address",
+        "website",
+        "phone",
         "email",
         "fax",
-        "phone",
-        "website",
         "wheelchair"
     ],
     "geometry": [
diff --git a/data/presets/presets/waterway/dock.json b/data/presets/presets/waterway/dock.json
index 85c6500fe..8caf3194a 100644
--- a/data/presets/presets/waterway/dock.json
+++ b/data/presets/presets/waterway/dock.json
@@ -12,9 +12,9 @@
     ],
     "terms": [
         "boat",
-        "marine",
         "ship",
-        "vessel"
+        "vessel",
+        "marine"
     ],
     "tags": {
         "waterway": "dock"
diff --git a/data/presets/presets/waterway/fuel.json b/data/presets/presets/waterway/fuel.json
index 6e8d775ab..e353d0467 100644
--- a/data/presets/presets/waterway/fuel.json
+++ b/data/presets/presets/waterway/fuel.json
@@ -8,14 +8,14 @@
         "fuel_multi"
     ],
     "moreFields": [
+        "payment_multi",
         "brand",
+        "seamark/type",
         "building",
+        "website",
+        "phone",
         "email",
         "fax",
-        "payment_multi",
-        "phone",
-        "seamark/type",
-        "website",
         "wheelchair"
     ],
     "geometry": [
@@ -23,10 +23,10 @@
         "area"
     ],
     "terms": [
-        "boat",
-        "diesel",
+        "petrol",
         "gas",
-        "petrol"
+        "diesel",
+        "boat"
     ],
     "tags": {
         "waterway": "fuel"
diff --git a/data/presets/presets/waterway/milestone.json b/data/presets/presets/waterway/milestone.json
index 03fe8f94a..be1b30c48 100644
--- a/data/presets/presets/waterway/milestone.json
+++ b/data/presets/presets/waterway/milestone.json
@@ -15,8 +15,8 @@
         "waterway": "milestone"
     },
     "terms": [
-        "marker",
-        "milestone"
+        "milestone",
+        "marker"
     ],
     "name": "Waterway Milestone"
 }
diff --git a/data/presets/presets/waterway/sanitary_dump_station.json b/data/presets/presets/waterway/sanitary_dump_station.json
index f6d4bfdcd..2ae6764d4 100644
--- a/data/presets/presets/waterway/sanitary_dump_station.json
+++ b/data/presets/presets/waterway/sanitary_dump_station.json
@@ -20,15 +20,15 @@
     ],
     "terms": [
         "Boat",
-        "CDP",
-        "Chemical Toilet",
-        "CTDP",
-        "Dump Station",
-        "Elsan",
-        "Pump out",
-        "Pumpout",
+        "Watercraft",
         "Sanitary",
-        "Watercraft"
+        "Dump Station",
+        "Pumpout",
+        "Pump out",
+        "Elsan",
+        "CDP",
+        "CTDP",
+        "Chemical Toilet"
     ],
     "tags": {
         "waterway": "sanitary_dump_station"
diff --git a/data/presets/presets/waterway/water_point.json b/data/presets/presets/waterway/water_point.json
index a7bad2434..effdd291f 100644
--- a/data/presets/presets/waterway/water_point.json
+++ b/data/presets/presets/waterway/water_point.json
@@ -1,6 +1,6 @@
 {
-    "icon": "maki-drinking-water",
-    "geometry": [
+     "icon": "maki-drinking-water",
+     "geometry": [
         "area",
         "vertex",
         "point"
diff --git a/data/presets/presets/waterway/weir.json b/data/presets/presets/waterway/weir.json
index aaae8ff74..e9c7f0452 100644
--- a/data/presets/presets/waterway/weir.json
+++ b/data/presets/presets/waterway/weir.json
@@ -7,7 +7,7 @@
         "material"
     ],
     "moreFields": [
-        "seamark/type"
+        "seamark/type"    
     ],
     "geometry": [
         "vertex",