diff --git a/data/presets.yaml b/data/presets.yaml
index ded436601..9d0b0c6a4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3083,7 +3083,7 @@ en:
       amenity/shelter/public_transport:
         # 'amenity=shelter, shelter_type=public_transport'
         name: Transit Shelter
-        # 'terms: bus stop,metro stop,waiting'
+        # 'terms: bus stop,metro stop,public transit shelter,public transport shelter,tram stop shelter,waiting'
         terms: '<translate with synonyms or related terms for ''Transit Shelter'', separated by commas>'
       amenity/shower:
         # amenity=shower
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 89eb9e6c4..2f61c2652 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -192,7 +192,7 @@
     "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", "waiting"], "tags": {"amenity": "shelter", "shelter_type": "public_transport"}, "reference": {"key": "shelter_type", "value": "public_transport"}, "name": "Transit 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", "supervised", "building_area", "wheelchair"], "moreFields": ["address", "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": ["lit", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "smoking_area"}, "name": "Smoking Area"},
     "amenity/social_centre": {"icon": "fas-handshake", "fields": ["name", "operator", "address", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["event", "fraternal", "fraternity", "hall", "organization", "professional", "society", "sorority", "union", "vetern"], "tags": {"amenity": "social_centre"}, "name": "Social Center"},
diff --git a/data/presets/presets/amenity/shelter/public_transport.json b/data/presets/presets/amenity/shelter/public_transport.json
index e7ee477f8..0394719a1 100644
--- a/data/presets/presets/amenity/shelter/public_transport.json
+++ b/data/presets/presets/amenity/shelter/public_transport.json
@@ -14,6 +14,9 @@
     "terms": [
         "bus stop",
         "metro stop",
+        "public transit shelter",
+        "public transport shelter",
+        "tram stop shelter",
         "waiting"
     ],
     "tags": {
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b6fc99d4a..545405c7c 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5043,7 +5043,7 @@
                 },
                 "amenity/shelter/public_transport": {
                     "name": "Transit Shelter",
-                    "terms": "bus stop,metro stop,waiting"
+                    "terms": "bus stop,metro stop,public transit shelter,public transport shelter,tram stop shelter,waiting"
                 },
                 "amenity/shower": {
                     "name": "Shower",