diff --git a/data/presets.yaml b/data/presets.yaml
index b8ad42953..66d1de119 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3515,7 +3515,7 @@ en:
       amenity/kindergarten:
         # amenity=kindergarten
         name: Preschool / Kindergarten Grounds
-        # 'terms: kindergarden,pre-school'
+        # 'terms: kindergarten,kindergarden,pre-school'
         terms: '<translate with synonyms or related terms for ''Preschool / Kindergarten Grounds'', separated by commas>'
       amenity/kneipp_water_cure:
         # amenity=kneipp_water_cure
@@ -4584,7 +4584,7 @@ en:
       building/farm_auxiliary:
         # building=farm_auxiliary
         name: Farm Building
-        # 'terms: agriculture,auxilary,chicken coop,farm auxiliary,pigsty,sty'
+        # 'terms: agriculture,auxiliary,auxilary,chicken coop,farm auxiliary,pigsty,sty'
         terms: '<translate with synonyms or related terms for ''Farm Building'', separated by commas>'
       building/garage:
         # building=garage
@@ -4636,7 +4636,7 @@ en:
       building/kindergarten:
         # building=kindergarten
         name: Preschool / Kindergarten Building
-        # 'terms: kindergarden,pre-school'
+        # 'terms: kindergarten,kindergarden,pre-school'
         terms: '<translate with synonyms or related terms for ''Preschool / Kindergarten Building'', separated by commas>'
       building/mosque:
         # building=mosque
@@ -7502,7 +7502,7 @@ en:
       public_transport/platform/bus_tram_point:
         # 'public_transport=platform, bus=yes, tram=yes'
         name: Tram & Bus Stop
-        # 'terms: bus,platform,public transit,public transportation,transit,transportation'
+        # 'terms: bus,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,transit,transportation,trolley'
         terms: '<translate with synonyms or related terms for ''Tram & Bus Stop'', separated by commas>'
       public_transport/platform/ferry:
         # 'public_transport=platform, ferry=yes'
@@ -8631,7 +8631,7 @@ en:
       shop/video:
         # shop=video
         name: Video Store
-        # 'terms: DVD,VHS,video casette'
+        # 'terms: DVD,VHS,video cassette,video casette'
         terms: '<translate with synonyms or related terms for ''Video Store'', separated by commas>'
       shop/video_games:
         # shop=video_games
@@ -8716,7 +8716,7 @@ en:
       tourism/artwork/graffiti:
         # 'tourism=artwork, artwork_type=graffiti'
         name: Graffiti
-        # 'terms: Street Artwork,Guerilla Artwork,Graffiti Artwork'
+        # 'terms: Street Artwork,Guerrilla 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'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c920862d6..9c3c649dd 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -140,7 +140,7 @@
   "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "opening_hours/covid19", "outdoor_seating"], "moreFields": ["delivery", "diet_multi", "drive_through", "email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "takeaway", "website", "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", "phone", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"},
   "amenity/karaoke_box": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19", "website"], "moreFields": ["air_conditioning", "email", "fax", "gnis/feature_id", "level", "min_age", "payment_multi", "phone", "ref/vatin", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"},
-  "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool / Kindergarten Grounds"},
+  "amenity/kindergarten": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "phone", "preschool"], "moreFields": ["email", "fax", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "max_age", "min_age", "not/name", "opening_hours", "opening_hours/covid19", "payment_multi", "website", "wheelchair"], "geometry": ["area", "point"], "terms": ["kindergarten", "kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool / Kindergarten Grounds"},
   "amenity/kneipp_water_cure": {"icon": "maki-hospital", "fields": ["kneipp_water_cure_multi", "opening_hours", "opening_hours/covid19", "fee"], "geometry": ["point", "area"], "terms": [], "tags": {"amenity": "kneipp_water_cure"}, "reference": {"key": "amenity", "value": "kneipp_water_cure"}, "name": "Kneipp Water Cure"},
   "amenity/language_school": {"icon": "temaki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "opening_hours/covid19", "language_multi"], "moreFields": ["email", "fax", "gnis/feature_id", "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/lavoir": {"icon": "temaki-detergent_bottle", "fields": ["name", "operator", "operator/type", "address", "access_simple", "building_area"], "moreFields": ["gnis/feature_id", "smoking", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "lavoir"}, "terms": ["clothing", "laundry", "washing"], "name": "Lavoir"},
@@ -363,7 +363,7 @@
   "building/cowshed": {"icon": "temaki-barn", "geometry": ["area"], "tags": {"building": "cowshed"}, "matchScore": 0.5, "terms": ["byre", "cow barn", "cow house", "cow shed", "cowbarn", "cowhouse", "dairy barn", "milking barn"], "name": "Cowshed"},
   "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"}, "terms": ["agriculture", "auxilary", "chicken coop", "farm auxiliary", "pigsty", "sty"], "matchScore": 0.5, "name": "Farm Building"},
+  "building/farm_auxiliary": {"icon": "maki-farm", "geometry": ["area"], "tags": {"building": "farm_auxiliary"}, "terms": ["agriculture", "auxiliary", "auxilary", "chicken coop", "farm auxiliary", "pigsty", "sty"], "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"},
@@ -376,7 +376,7 @@
   "building/houseboat": {"icon": "temaki-houseboat", "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": "fas-school", "geometry": ["area"], "terms": ["kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool / Kindergarten Building"},
+  "building/kindergarten": {"icon": "fas-school", "geometry": ["area"], "terms": ["kindergarten", "kindergarden", "pre-school"], "tags": {"building": "kindergarten"}, "matchScore": 0.5, "name": "Preschool / Kindergarten Building"},
   "building/mosque": {"icon": "fas-mosque", "geometry": ["area"], "tags": {"building": "mosque"}, "matchScore": 0.5, "name": "Mosque Building"},
   "building/office": {"icon": "maki-suitcase", "fields": ["{building}", "smoking"], "moreFields": ["{building}", "phone", "website"], "geometry": ["area"], "tags": {"building": "office"}, "matchScore": 0.5, "terms": ["business center", "office block"], "name": "Office Building"},
   "building/pavilion": {"icon": "maki-building", "fields": ["{building}", "smoking"], "geometry": ["area"], "terms": ["sports"], "tags": {"building": "pavilion"}, "matchScore": 0.5, "name": "Pavilion Building"},
@@ -992,7 +992,7 @@
   "public_transport/platform/train_point": {"icon": "temaki-train", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point"], "tags": {"public_transport": "platform", "train": "yes"}, "reference": {"key": "railway", "value": "platform"}, "searchable": false, "name": "Train Stop / Platform"},
   "public_transport/platform/aerialway": {"icon": "temaki-board_gondola_lift", "fields": ["{public_transport/platform}"], "moreFields": ["{public_transport/platform}"], "geometry": ["line", "area"], "tags": {"public_transport": "platform", "aerialway": "yes"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["aerialway", "cable car", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Aerialway Platform"},
   "public_transport/platform/bus_point": {"icon": "temaki-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_tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes", "tram": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "tram": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "platform", "public transit", "public transportation", "transit", "transportation"], "name": "Tram & Bus Stop"},
+  "public_transport/platform/bus_tram_point": {"icon": "temaki-tram", "fields": ["{public_transport/platform_point}"], "moreFields": ["{public_transport/platform_point}"], "geometry": ["point", "vertex"], "tags": {"public_transport": "platform", "bus": "yes", "tram": "yes"}, "addTags": {"public_transport": "platform", "bus": "yes", "tram": "yes", "highway": "bus_stop"}, "reference": {"key": "public_transport", "value": "platform"}, "terms": ["bus", "light rail", "platform", "public transit", "public transportation", "rail", "streetcar", "track", "tram", "transit", "transportation", "trolley"], "name": "Tram & Bus Stop"},
   "public_transport/platform/bus": {"icon": "temaki-board_bus", "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-board_ferry", "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-board_light_rail", "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"},
@@ -1227,7 +1227,7 @@
   "shop/vacuum_cleaner": {"icon": "temaki-vacuum", "geometry": ["point", "area"], "tags": {"shop": "vacuum_cleaner"}, "name": "Vacuum Cleaner Store"},
   "shop/variety_store": {"icon": "maki-shop", "geometry": ["point", "area"], "tags": {"shop": "variety_store"}, "name": "Variety Store"},
   "shop/video_games": {"icon": "maki-gaming", "geometry": ["point", "area"], "tags": {"shop": "video_games"}, "name": "Video Game Store"},
-  "shop/video": {"icon": "temaki-movie_rental", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
+  "shop/video": {"icon": "temaki-movie_rental", "moreFields": ["{shop}", "min_age"], "geometry": ["point", "area"], "terms": ["DVD", "VHS", "video cassette", "video casette"], "tags": {"shop": "video"}, "name": "Video Store"},
   "shop/watches": {"icon": "maki-watch", "geometry": ["point", "area"], "tags": {"shop": "watches"}, "name": "Watches Shop"},
   "shop/water_sports": {"icon": "fas-swimmer", "geometry": ["point", "area"], "tags": {"shop": "water_sports"}, "name": "Watersport/Swim Shop"},
   "shop/water": {"icon": "temaki-water_bottle", "geometry": ["point", "area"], "tags": {"shop": "water"}, "name": "Drinking Water Shop"},
@@ -1243,7 +1243,7 @@
   "tourism/aquarium": {"icon": "maki-aquarium", "fields": ["name", "operator", "address", "building_area", "opening_hours", "opening_hours/covid19"], "moreFields": ["charge_fee", "email", "fax", "fee", "gnis/feature_id", "internet_access", "internet_access/fee", "internet_access/ssid", "payment_multi_fee", "phone", "ref/vatin", "smoking", "website", "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", "inscription"], "geometry": ["point", "vertex"], "tags": {"tourism": "artwork", "artwork_type": "bust"}, "reference": {"key": "artwork_type", "value": "bust"}, "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", "value": "graffiti"}, "terms": ["Street Artwork", "Guerilla Artwork", "Graffiti 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", "value": "graffiti"}, "terms": ["Street Artwork", "Guerrilla Artwork", "Guerilla Artwork", "Graffiti Artwork"], "name": "Graffiti"},
   "tourism/artwork/installation": {"icon": "temaki-sculpture", "fields": ["name", "artist"], "geometry": ["point", "vertex", "line", "area"], "tags": {"tourism": "artwork", "artwork_type": "installation"}, "reference": {"key": "artwork_type", "value": "installation"}, "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": "temaki-sculpture", "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"},
diff --git a/data/presets/presets/public_transport/platform/bus_tram_point.json b/data/presets/presets/public_transport/platform/bus_tram_point.json
index 5bc30fccb..da89b0b61 100644
--- a/data/presets/presets/public_transport/platform/bus_tram_point.json
+++ b/data/presets/presets/public_transport/platform/bus_tram_point.json
@@ -27,11 +27,17 @@
     },
     "terms": [
         "bus",
+        "light rail",
         "platform",
         "public transit",
         "public transportation",
+        "rail",
+        "streetcar",
+        "track",
+        "tram",
         "transit",
-        "transportation"
+        "transportation",
+        "trolley"
     ],
     "name": "Tram & Bus Stop"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c056a42e7..ec67f47e9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5908,7 +5908,7 @@
                 },
                 "amenity/kindergarten": {
                     "name": "Preschool / Kindergarten Grounds",
-                    "terms": "kindergarden,pre-school"
+                    "terms": "kindergarten,kindergarden,pre-school"
                 },
                 "amenity/kneipp_water_cure": {
                     "name": "Kneipp Water Cure",
@@ -6796,7 +6796,7 @@
                 },
                 "building/farm_auxiliary": {
                     "name": "Farm Building",
-                    "terms": "agriculture,auxilary,chicken coop,farm auxiliary,pigsty,sty"
+                    "terms": "agriculture,auxiliary,auxilary,chicken coop,farm auxiliary,pigsty,sty"
                 },
                 "building/farm": {
                     "name": "Farm House",
@@ -6848,7 +6848,7 @@
                 },
                 "building/kindergarten": {
                     "name": "Preschool / Kindergarten Building",
-                    "terms": "kindergarden,pre-school"
+                    "terms": "kindergarten,kindergarden,pre-school"
                 },
                 "building/mosque": {
                     "name": "Mosque Building",
@@ -9274,7 +9274,7 @@
                 },
                 "public_transport/platform/bus_tram_point": {
                     "name": "Tram & Bus Stop",
-                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                    "terms": "bus,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,transit,transportation,trolley"
                 },
                 "public_transport/platform/bus": {
                     "name": "Bus Platform",
@@ -10207,7 +10207,7 @@
                 },
                 "shop/video": {
                     "name": "Video Store",
-                    "terms": "DVD,VHS,video casette"
+                    "terms": "DVD,VHS,video cassette,video casette"
                 },
                 "shop/watches": {
                     "name": "Watches Shop",
@@ -10271,7 +10271,7 @@
                 },
                 "tourism/artwork/graffiti": {
                     "name": "Graffiti",
-                    "terms": "Street Artwork,Guerilla Artwork,Graffiti Artwork"
+                    "terms": "Street Artwork,Guerrilla Artwork,Guerilla Artwork,Graffiti Artwork"
                 },
                 "tourism/artwork/installation": {
                     "name": "Art Installation",