diff --git a/data/presets.yaml b/data/presets.yaml
index 94465b893..ed49710f8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1671,7 +1671,6 @@ en:
       aerialway/station:
         # aerialway=station
         name: Aerialway Station
-        terms: '<translate with synonyms or related terms for ''Aerialway Station'', separated by commas>'
       aerialway/t-bar:
         # aerialway=t-bar
         name: T-bar Lift
@@ -1795,8 +1794,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Currency Exchange'', separated by commas>'
       amenity/bus_station:
         # amenity=bus_station
-        name: Bus Station
-        terms: '<translate with synonyms or related terms for ''Bus Station'', separated by commas>'
+        name: Bus Station / Terminal
       amenity/cafe:
         # amenity=cafe
         name: Cafe
@@ -1913,8 +1911,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Fast Food'', separated by commas>'
       amenity/ferry_terminal:
         # amenity=ferry_terminal
-        name: Ferry Terminal
-        terms: '<translate with synonyms or related terms for ''Ferry Terminal'', separated by commas>'
+        name: Ferry Station / Terminal
       amenity/fire_station:
         # amenity=fire_station
         name: Fire Station
@@ -3016,8 +3013,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Bridle Path'', separated by commas>'
       highway/bus_stop:
         # highway=bus_stop
-        name: Bus Stop
-        terms: '<translate with synonyms or related terms for ''Bus Stop'', separated by commas>'
+        name: Bus Stop / Platform
       highway/corridor:
         # highway=corridor
         name: Indoor Corridor
@@ -4403,12 +4399,159 @@ en:
         terms: '<translate with synonyms or related terms for ''Transformer'', separated by commas>'
       public_transport/platform:
         # public_transport=platform
-        name: Platform
-        terms: '<translate with synonyms or related terms for ''Platform'', separated by commas>'
+        name: Transit Stop / Platform
+        # 'terms: platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Stop / Platform'', separated by commas>'
+      public_transport/platform_aerialway:
+        # 'public_transport=platform, aerialway=yes'
+        name: Aerialway Stop / Platform
+        # 'terms: aerialway,cable car,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Stop / Platform'', separated by commas>'
+      public_transport/platform_bus:
+        # 'public_transport=platform, bus=yes'
+        name: Bus Stop / Platform
+        # 'terms: bus,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Stop / Platform'', separated by commas>'
+      public_transport/platform_ferry:
+        # 'public_transport=platform, ferry=yes'
+        name: Ferry Stop / Platform
+        # 'terms: boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Stop / Platform'', separated by commas>'
+      public_transport/platform_light_rail:
+        # 'public_transport=platform, light_rail=yes'
+        name: Light Rail Stop / Platform
+        # '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 Stop / Platform'', separated by commas>'
+      public_transport/platform_monorail:
+        # 'public_transport=platform, monorail=yes'
+        name: Monorail Stop / Platform
+        # 'terms: monorail,platform,public transit,public transportation,rail,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Monorail Stop / Platform'', separated by commas>'
+      public_transport/platform_subway:
+        # 'public_transport=platform, train=yes'
+        name: Subway Stop / Platform
+        # 'terms: metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Stop / Platform'', separated by commas>'
+      public_transport/platform_train:
+        # 'public_transport=platform, train=yes'
+        name: Train Stop / Platform
+        # 'terms: platform,public transit,public transportation,rail,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Stop / Platform'', separated by commas>'
+      public_transport/platform_tram:
+        # 'public_transport=platform, tram=yes'
+        name: Tram Stop / Platform
+        # '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 Stop / Platform
+        # 'terms: bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Stop / Platform'', separated by commas>'
+      public_transport/station:
+        # public_transport=station
+        name: Transit Station
+        # 'terms: public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Station'', separated by commas>'
+      public_transport/station_aerialway:
+        # 'public_transport=station, aerialway=yes'
+        name: Aerialway Station
+        # 'terms: aerialway,cable car,public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Station'', separated by commas>'
+      public_transport/station_bus:
+        # 'public_transport=station, bus=yes'
+        name: Bus Station / Terminal
+        # 'terms: bus,public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Station / Terminal'', separated by commas>'
+      public_transport/station_ferry:
+        # 'public_transport=station, ferry=yes'
+        name: Ferry Station / Terminal
+        # 'terms: boat,dock,ferry,pier,public transit,public transportation,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Station / Terminal'', separated by commas>'
+      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,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'
+        name: Train Station
+        # 'terms: monorail,public transit,public transportation,rail,station,terminal,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Station'', separated by commas>'
+      public_transport/station_subway:
+        # 'public_transport=station, subway=yes'
+        name: Subway Station
+        # 'terms: metro,public transit,public transportation,rail,station,subway,terminal,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Station'', separated by commas>'
+      public_transport/station_train:
+        # 'public_transport=station, train=yes'
+        name: Train Station
+        # 'terms: public transit,public transportation,rail,station,terminal,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Station'', separated by commas>'
+      public_transport/station_train_halt:
+        # 'public_transport=station, train=yes, railway=halt'
+        name: Train Station (Halt / Request)
+        # 'terms: halt,public transit,public transportation,rail,station,track,train,transit,transportation,whistle stop'
+        terms: '<translate with synonyms or related terms for ''Train Station (Halt / Request)'', separated by commas>'
+      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,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,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Station / Terminal'', separated by commas>'
       public_transport/stop_position:
         # public_transport=stop_position
-        name: Stop Position
-        terms: '<translate with synonyms or related terms for ''Stop Position'', separated by commas>'
+        name: Transit Stopping Location
+        # 'terms: public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Transit Stopping Location'', separated by commas>'
+      public_transport/stop_position_aerialway:
+        # 'public_transport=stop_position, aerialway=yes'
+        name: Aerialway Stopping Location
+        # 'terms: aerialway,cable car,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Aerialway Stopping Location'', separated by commas>'
+      public_transport/stop_position_bus:
+        # 'public_transport=stop_position, bus=yes'
+        name: Bus Stopping Location
+        # 'terms: bus,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Bus Stopping Location'', separated by commas>'
+      public_transport/stop_position_ferry:
+        # 'public_transport=stop_position, ferry=yes'
+        name: Ferry Stopping Location
+        # 'terms: boat,dock,ferry,pier,public transit,public transportation,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Ferry Stopping Location'', separated by commas>'
+      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,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'
+        name: Monorail Stopping Location
+        # 'terms: monorail,public transit,public transportation,rail,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Monorail Stopping Location'', separated by commas>'
+      public_transport/stop_position_subway:
+        # 'public_transport=stop_position, subway=yes'
+        name: Subway Stopping Location
+        # 'terms: metro,public transit,public transportation,rail,subway,track,transit,transportation,underground'
+        terms: '<translate with synonyms or related terms for ''Subway Stopping Location'', separated by commas>'
+      public_transport/stop_position_train:
+        # 'public_transport=stop_position, train=yes'
+        name: Train Stopping Location
+        # 'terms: public transit,public transportation,rail,track,train,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Train Stopping Location'', separated by commas>'
+      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,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,trolley,transit,transportation'
+        terms: '<translate with synonyms or related terms for ''Trolleybus Stopping Location'', separated by commas>'
       railway:
         # railway=*
         name: Railway
@@ -4442,9 +4585,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Funicular'', separated by commas>'
       railway/halt:
         # railway=halt
-        name: Railway Halt
-        # 'terms: break,interrupt,rest,wait,interruption'
-        terms: '<translate with synonyms or related terms for ''Railway Halt'', separated by commas>'
+        name: Train Station (Halt / Request)
       railway/level_crossing:
         # railway=level_crossing
         name: Railway Crossing (Road)
@@ -4476,8 +4617,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Narrow Gauge Rail'', separated by commas>'
       railway/platform:
         # railway=platform
-        name: Railway Platform
-        terms: '<translate with synonyms or related terms for ''Railway Platform'', separated by commas>'
+        name: Train Stop / Platform
       railway/rail:
         # railway=rail
         name: Rail
@@ -4489,9 +4629,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Railway Signal'', separated by commas>'
       railway/station:
         # railway=station
-        name: Railway Station
-        # 'terms: train station,station'
-        terms: '<translate with synonyms or related terms for ''Railway Station'', separated by commas>'
+        name: Train Station
       railway/subway:
         # railway=subway
         name: Subway
@@ -4519,9 +4657,7 @@ en:
         terms: '<translate with synonyms or related terms for ''Tram'', separated by commas>'
       railway/tram_stop:
         # railway=tram_stop
-        name: Tram Stop
-        # 'terms: light rail,streetcar,tram,trolley'
-        terms: '<translate with synonyms or related terms for ''Tram Stop'', separated by commas>'
+        name: Tram Stopping Position
       relation:
         name: Relation
         terms: '<translate with synonyms or related terms for ''Relation'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 76461fff5..6722747c5 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -183,6 +183,25 @@
             },
             "name": "Billboard"
         },
+        "aerialway/station": {
+            "icon": "aerialway",
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "fields": [
+                "aerialway/access",
+                "aerialway/summer/access",
+                "elevation",
+                "building_area"
+            ],
+            "tags": {
+                "aerialway": "station"
+            },
+            "name": "Aerialway Station",
+            "searchable": false
+        },
         "aerialway/cable_car": {
             "geometry": [
                 "line"
@@ -346,24 +365,6 @@
             },
             "name": "Rope Tow Lift"
         },
-        "aerialway/station": {
-            "icon": "aerialway",
-            "geometry": [
-                "point",
-                "vertex",
-                "area"
-            ],
-            "fields": [
-                "aerialway/access",
-                "aerialway/summer/access",
-                "elevation",
-                "building_area"
-            ],
-            "tags": {
-                "aerialway": "station"
-            },
-            "name": "Aerialway Station"
-        },
         "aerialway/t-bar": {
             "geometry": [
                 "line"
@@ -520,6 +521,26 @@
             },
             "name": "Airport Terminal"
         },
+        "amenity/bus_station": {
+            "icon": "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
+        },
         "amenity/coworking_space": {
             "icon": "commercial",
             "fields": [
@@ -541,6 +562,27 @@
             "name": "Coworking Space",
             "searchable": false
         },
+        "amenity/ferry_terminal": {
+            "icon": "ferry",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "ferry_terminal"
+            },
+            "name": "Ferry Station / Terminal",
+            "searchable": false
+        },
         "amenity/nursing_home": {
             "icon": "wheelchair",
             "fields": [
@@ -987,25 +1029,6 @@
             },
             "name": "Currency Exchange"
         },
-        "amenity/bus_station": {
-            "icon": "bus",
-            "fields": [
-                "name",
-                "building_area",
-                "operator",
-                "internet_access",
-                "internet_access/fee",
-                "internet_access/ssid"
-            ],
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "tags": {
-                "amenity": "bus_station"
-            },
-            "name": "Bus Station"
-        },
         "amenity/cafe": {
             "icon": "cafe",
             "fields": [
@@ -1548,26 +1571,6 @@
             ],
             "name": "Fast Food"
         },
-        "amenity/ferry_terminal": {
-            "icon": "ferry",
-            "fields": [
-                "name",
-                "network",
-                "operator",
-                "address",
-                "building_area"
-            ],
-            "geometry": [
-                "point",
-                "vertex",
-                "area"
-            ],
-            "terms": [],
-            "tags": {
-                "amenity": "ferry_terminal"
-            },
-            "name": "Ferry Terminal"
-        },
         "amenity/fire_station": {
             "icon": "fire-station",
             "fields": [
@@ -6632,6 +6635,25 @@
             },
             "name": "Speech Therapist"
         },
+        "highway/bus_stop": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "highway": "bus_stop"
+            },
+            "name": "Bus Stop / Platform",
+            "searchable": false
+        },
         "highway/bridleway": {
             "fields": [
                 "name",
@@ -6654,25 +6676,6 @@
             ],
             "name": "Bridle Path"
         },
-        "highway/bus_stop": {
-            "icon": "bus",
-            "fields": [
-                "name",
-                "network",
-                "operator",
-                "bench",
-                "shelter"
-            ],
-            "geometry": [
-                "point",
-                "vertex"
-            ],
-            "tags": {
-                "highway": "bus_stop"
-            },
-            "terms": [],
-            "name": "Bus Stop"
-        },
         "highway/corridor": {
             "icon": "highway-footway",
             "fields": [
@@ -13017,13 +13020,433 @@
             },
             "name": "Transformer"
         },
-        "public_transport/platform": {
+        "public_transport/platform_aerialway": {
+            "icon": "aerialway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "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 Stop / Platform"
+        },
+        "public_transport/platform_bus": {
             "icon": "bus",
             "fields": [
                 "name",
                 "ref_platform",
                 "network",
                 "operator",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "bus": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "bus": "yes",
+                "highway": "bus_stop"
+            },
+            "removeTags": {
+                "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 / Platform"
+        },
+        "public_transport/platform_ferry": {
+            "icon": "ferry",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "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 Stop / Platform"
+        },
+        "public_transport/platform_light_rail": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "light_rail": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "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 Stop / Platform"
+        },
+        "public_transport/platform_monorail": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "monorail": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "monorail": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "monorail",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "transit",
+                "transportation"
+            ],
+            "name": "Monorail Stop / Platform"
+        },
+        "public_transport/platform_subway": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "platform"
+            },
+            "terms": [
+                "metro",
+                "platform",
+                "public transit",
+                "public transportation",
+                "rail",
+                "subway",
+                "track",
+                "transit",
+                "transportation",
+                "underground"
+            ],
+            "name": "Subway Stop / Platform"
+        },
+        "public_transport/platform_train": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "train": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "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 Stop / Platform"
+        },
+        "public_transport/platform_tram": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "tram": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "tram": "yes",
+                "railway": "platform"
+            },
+            "removeTags": {
+                "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 Stop / Platform"
+        },
+        "public_transport/platform_trolleybus": {
+            "icon": "bus",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "lit",
+                "bench",
+                "shelter"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "line",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "platform",
+                "trolleybus": "yes"
+            },
+            "addTags": {
+                "public_transport": "platform",
+                "trolleybus": "yes",
+                "highway": "bus_stop"
+            },
+            "removeTags": {
+                "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 / Platform"
+        },
+        "public_transport/platform": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "network",
+                "operator",
+                "surface",
+                "lit",
+                "bench",
                 "shelter"
             ],
             "geometry": [
@@ -13035,7 +13458,842 @@
             "tags": {
                 "public_transport": "platform"
             },
-            "name": "Platform"
+            "terms": [
+                "platform",
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Stop / Platform",
+            "matchScore": 0.2
+        },
+        "public_transport/station_aerialway": {
+            "icon": "aerialway",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "aerialway/access",
+                "aerialway/summer/access",
+                "elevation",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "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": "bus",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "bus": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "bus": "yes",
+                "amenity": "bus_station"
+            },
+            "removeTags": {
+                "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": "ferry",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "ferry": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "ferry": "yes",
+                "amenity": "ferry_terminal"
+            },
+            "removeTags": {
+                "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": "rail-light",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "light_rail": "yes",
+                "railway": "station",
+                "station": "light_rail"
+            },
+            "removeTags": {
+                "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": "rail-metro",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "monorail": "yes",
+                "railway": "station"
+            },
+            "removeTags": {
+                "public_transport": "station",
+                "monorail": "yes",
+                "railway": "station"
+            },
+            "reference": {
+                "key": "railway",
+                "value": "station"
+            },
+            "terms": [
+                "monorail",
+                "public transit",
+                "public transportation",
+                "rail",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Train Station"
+        },
+        "public_transport/station_subway": {
+            "icon": "rail-metro",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "subway": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "subway": "yes",
+                "railway": "station",
+                "station": "subway"
+            },
+            "removeTags": {
+                "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": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "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": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "train": "yes",
+                "railway": "station"
+            },
+            "removeTags": {
+                "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": "rail-light",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "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": "bus",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station",
+                "trolleybus": "yes"
+            },
+            "addTags": {
+                "public_transport": "station",
+                "trolleybus": "yes",
+                "amenity": "bus_station"
+            },
+            "removeTags": {
+                "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": "rail",
+            "fields": [
+                "name",
+                "network",
+                "operator",
+                "address",
+                "building_area",
+                "internet_access",
+                "internet_access/fee",
+                "internet_access/ssid"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "public_transport": "station"
+            },
+            "terms": [
+                "public transit",
+                "public transportation",
+                "station",
+                "terminal",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Station",
+            "matchScore": 0.2
+        },
+        "public_transport/stop_position_aerialway": {
+            "icon": "aerialway",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "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": "bus",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "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": "ferry",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "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": "rail-light",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "light_rail": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "light_rail": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "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": "rail-metro",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "monorail": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "monorail": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "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": "rail-metro",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "subway": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "subway": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "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": "rail",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "train": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "train": "yes",
+                "railway": "stop"
+            },
+            "removeTags": {
+                "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": "rail-light",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "geometry": [
+                "vertex"
+            ],
+            "tags": {
+                "public_transport": "stop_position",
+                "tram": "yes"
+            },
+            "addTags": {
+                "public_transport": "stop_position",
+                "tram": "yes",
+                "railway": "tram_stop"
+            },
+            "removeTags": {
+                "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": "bus",
+            "fields": [
+                "name",
+                "ref_stop_position",
+                "network",
+                "operator"
+            ],
+            "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": "bus",
@@ -13051,7 +14309,101 @@
             "tags": {
                 "public_transport": "stop_position"
             },
-            "name": "Stop Position"
+            "terms": [
+                "public transit",
+                "public transportation",
+                "transit",
+                "transportation"
+            ],
+            "name": "Transit Stopping Location",
+            "matchScore": 0.2
+        },
+        "railway/halt": {
+            "icon": "rail",
+            "geometry": [
+                "point",
+                "vertex"
+            ],
+            "tags": {
+                "railway": "halt"
+            },
+            "terms": [
+                "break",
+                "interrupt",
+                "rest",
+                "wait",
+                "interruption"
+            ],
+            "name": "Train Station (Halt / Request)",
+            "searchable": false
+        },
+        "railway/platform": {
+            "icon": "highway-footway",
+            "fields": [
+                "name",
+                "ref_platform",
+                "surface",
+                "lit",
+                "shelter"
+            ],
+            "geometry": [
+                "line",
+                "area"
+            ],
+            "tags": {
+                "railway": "platform"
+            },
+            "name": "Train Stop / Platform",
+            "searchable": false
+        },
+        "railway/station": {
+            "icon": "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"
+            ],
+            "name": "Train Station",
+            "searchable": false
+        },
+        "railway/tram_stop": {
+            "icon": "rail-light",
+            "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": "railway-abandoned",
@@ -13153,24 +14505,6 @@
             },
             "name": "Funicular"
         },
-        "railway/halt": {
-            "icon": "rail",
-            "geometry": [
-                "point",
-                "vertex"
-            ],
-            "tags": {
-                "railway": "halt"
-            },
-            "name": "Railway Halt",
-            "terms": [
-                "break",
-                "interrupt",
-                "rest",
-                "wait",
-                "interruption"
-            ]
-        },
         "railway/level_crossing": {
             "icon": "cross",
             "geometry": [
@@ -13289,24 +14623,6 @@
             ],
             "name": "Narrow Gauge Rail"
         },
-        "railway/platform": {
-            "icon": "highway-footway",
-            "fields": [
-                "name",
-                "ref_platform",
-                "surface",
-                "lit",
-                "shelter"
-            ],
-            "geometry": [
-                "line",
-                "area"
-            ],
-            "tags": {
-                "railway": "platform"
-            },
-            "name": "Railway Platform"
-        },
         "railway/rail": {
             "icon": "railway-rail",
             "geometry": [
@@ -13341,32 +14657,6 @@
             ],
             "name": "Railway Signal"
         },
-        "railway/station": {
-            "icon": "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"
-            ],
-            "name": "Railway Station"
-        },
         "railway/subway_entrance": {
             "icon": "entrance",
             "geometry": [
@@ -13440,27 +14730,6 @@
             ],
             "name": "Train Wash"
         },
-        "railway/tram_stop": {
-            "icon": "rail-light",
-            "fields": [
-                "name",
-                "network",
-                "operator"
-            ],
-            "geometry": [
-                "vertex"
-            ],
-            "tags": {
-                "railway": "tram_stop"
-            },
-            "terms": [
-                "light rail",
-                "streetcar",
-                "tram",
-                "trolley"
-            ],
-            "name": "Tram Stop"
-        },
         "railway/tram": {
             "icon": "railway-light-rail",
             "geometry": [
diff --git a/data/presets/presets/aerialway/station.json b/data/presets/presets/aerialway/_station.json
similarity index 83%
rename from data/presets/presets/aerialway/station.json
rename to data/presets/presets/aerialway/_station.json
index 690a357ae..c31df230b 100644
--- a/data/presets/presets/aerialway/station.json
+++ b/data/presets/presets/aerialway/_station.json
@@ -14,5 +14,6 @@
     "tags": {
         "aerialway": "station"
     },
-    "name": "Aerialway Station"
+    "name": "Aerialway Station",
+    "searchable": false
 }
diff --git a/data/presets/presets/amenity/bus_station.json b/data/presets/presets/amenity/_bus_station.json
similarity index 83%
rename from data/presets/presets/amenity/bus_station.json
rename to data/presets/presets/amenity/_bus_station.json
index a533f4f6d..0111a1fb2 100644
--- a/data/presets/presets/amenity/bus_station.json
+++ b/data/presets/presets/amenity/_bus_station.json
@@ -15,5 +15,6 @@
     "tags": {
         "amenity": "bus_station"
     },
-    "name": "Bus Station"
+    "name": "Bus Station / Terminal",
+    "searchable": false
 }
diff --git a/data/presets/presets/amenity/ferry_terminal.json b/data/presets/presets/amenity/_ferry_terminal.json
similarity index 82%
rename from data/presets/presets/amenity/ferry_terminal.json
rename to data/presets/presets/amenity/_ferry_terminal.json
index aad03b6cb..1bc720685 100644
--- a/data/presets/presets/amenity/ferry_terminal.json
+++ b/data/presets/presets/amenity/_ferry_terminal.json
@@ -16,5 +16,6 @@
     "tags": {
         "amenity": "ferry_terminal"
     },
-    "name": "Ferry Terminal"
+    "name": "Ferry Station / Terminal",
+    "searchable": false
 }
diff --git a/data/presets/presets/highway/bus_stop.json b/data/presets/presets/highway/_bus_stop.json
similarity index 80%
rename from data/presets/presets/highway/bus_stop.json
rename to data/presets/presets/highway/_bus_stop.json
index 346e46853..87d0a5c01 100644
--- a/data/presets/presets/highway/bus_stop.json
+++ b/data/presets/presets/highway/_bus_stop.json
@@ -14,6 +14,6 @@
     "tags": {
         "highway": "bus_stop"
     },
-    "terms": [],
-    "name": "Bus Stop"
+    "name": "Bus Stop / Platform",
+    "searchable": false
 }
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
index 5626b2557..ebe13be67 100644
--- a/data/presets/presets/public_transport/platform.json
+++ b/data/presets/presets/public_transport/platform.json
@@ -1,10 +1,13 @@
 {
-    "icon": "bus",
+    "icon": "highway-footway",
     "fields": [
         "name",
         "ref_platform",
         "network",
         "operator",
+        "surface",
+        "lit",
+        "bench",
         "shelter"
     ],
     "geometry": [
@@ -16,5 +19,13 @@
     "tags": {
         "public_transport": "platform"
     },
-    "name": "Platform"
+    "terms": [
+        "platform",
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Stop / Platform",
+    "matchScore": 0.2
 }
diff --git a/data/presets/presets/public_transport/platform_aerialway.json b/data/presets/presets/public_transport/platform_aerialway.json
new file mode 100644
index 000000000..034c841cc
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_aerialway.json
@@ -0,0 +1,36 @@
+{
+    "icon": "aerialway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "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 Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_bus.json b/data/presets/presets/public_transport/platform_bus.json
new file mode 100644
index 000000000..bf9cda26a
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_bus.json
@@ -0,0 +1,45 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "bus": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "bus": "yes",
+        "highway": "bus_stop"
+    },
+    "removeTags": {
+        "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 / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_ferry.json b/data/presets/presets/public_transport/platform_ferry.json
new file mode 100644
index 000000000..3fb3d5255
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_ferry.json
@@ -0,0 +1,38 @@
+{
+    "icon": "ferry",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "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 Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_light_rail.json b/data/presets/presets/public_transport/platform_light_rail.json
new file mode 100644
index 000000000..0a2120e90
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_light_rail.json
@@ -0,0 +1,51 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "light_rail": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "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 Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_monorail.json b/data/presets/presets/public_transport/platform_monorail.json
new file mode 100644
index 000000000..c2d7ad15f
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_monorail.json
@@ -0,0 +1,47 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "monorail": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "monorail": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "monorail",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "transit",
+        "transportation"
+    ],
+    "name": "Monorail Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_subway.json b/data/presets/presets/public_transport/platform_subway.json
new file mode 100644
index 000000000..0ad5fc628
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_subway.json
@@ -0,0 +1,50 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "platform"
+    },
+    "terms": [
+        "metro",
+        "platform",
+        "public transit",
+        "public transportation",
+        "rail",
+        "subway",
+        "track",
+        "transit",
+        "transportation",
+        "underground"
+    ],
+    "name": "Subway Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_train.json b/data/presets/presets/public_transport/platform_train.json
new file mode 100644
index 000000000..86dc71380
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_train.json
@@ -0,0 +1,48 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "train": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "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 Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_tram.json b/data/presets/presets/public_transport/platform_tram.json
new file mode 100644
index 000000000..8a2cc772d
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_tram.json
@@ -0,0 +1,52 @@
+{
+    "icon": "highway-footway",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "surface",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "tram": "yes",
+        "railway": "platform"
+    },
+    "removeTags": {
+        "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 Stop / Platform"
+}
diff --git a/data/presets/presets/public_transport/platform_trolleybus.json b/data/presets/presets/public_transport/platform_trolleybus.json
new file mode 100644
index 000000000..7b6163714
--- /dev/null
+++ b/data/presets/presets/public_transport/platform_trolleybus.json
@@ -0,0 +1,50 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref_platform",
+        "network",
+        "operator",
+        "lit",
+        "bench",
+        "shelter"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "line",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "platform",
+        "trolleybus": "yes"
+    },
+    "addTags": {
+        "public_transport": "platform",
+        "trolleybus": "yes",
+        "highway": "bus_stop"
+    },
+    "removeTags": {
+        "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 / Platform"
+}
diff --git a/data/presets/presets/public_transport/station.json b/data/presets/presets/public_transport/station.json
new file mode 100644
index 000000000..672712568
--- /dev/null
+++ b/data/presets/presets/public_transport/station.json
@@ -0,0 +1,31 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station"
+    },
+    "terms": [
+        "public transit",
+        "public transportation",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Station",
+    "matchScore": 0.2
+}
diff --git a/data/presets/presets/public_transport/station_aerialway.json b/data/presets/presets/public_transport/station_aerialway.json
new file mode 100644
index 000000000..97b953b0a
--- /dev/null
+++ b/data/presets/presets/public_transport/station_aerialway.json
@@ -0,0 +1,39 @@
+{
+    "icon": "aerialway",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "aerialway/access",
+        "aerialway/summer/access",
+        "elevation",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/public_transport/station_bus.json b/data/presets/presets/public_transport/station_bus.json
new file mode 100644
index 000000000..2ea27934b
--- /dev/null
+++ b/data/presets/presets/public_transport/station_bus.json
@@ -0,0 +1,46 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "bus": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "bus": "yes",
+        "amenity": "bus_station"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/station_ferry.json b/data/presets/presets/public_transport/station_ferry.json
new file mode 100644
index 000000000..503c060a4
--- /dev/null
+++ b/data/presets/presets/public_transport/station_ferry.json
@@ -0,0 +1,49 @@
+{
+    "icon": "ferry",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "ferry": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "ferry": "yes",
+        "amenity": "ferry_terminal"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/station_light_rail.json b/data/presets/presets/public_transport/station_light_rail.json
new file mode 100644
index 000000000..081dd8023
--- /dev/null
+++ b/data/presets/presets/public_transport/station_light_rail.json
@@ -0,0 +1,53 @@
+{
+    "icon": "rail-light",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "light_rail": "yes",
+        "railway": "station",
+        "station": "light_rail"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/station_monorail.json b/data/presets/presets/public_transport/station_monorail.json
new file mode 100644
index 000000000..356cdf5b2
--- /dev/null
+++ b/data/presets/presets/public_transport/station_monorail.json
@@ -0,0 +1,47 @@
+{
+    "icon": "rail-metro",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "monorail": "yes",
+        "railway": "station"
+    },
+    "removeTags": {
+        "public_transport": "station",
+        "monorail": "yes",
+        "railway": "station"
+    },
+    "reference": {
+        "key": "railway",
+        "value": "station"
+    },
+    "terms": [
+        "monorail",
+        "public transit",
+        "public transportation",
+        "rail",
+        "station",
+        "terminal",
+        "transit",
+        "transportation"
+    ],
+    "name": "Train Station"
+}
diff --git a/data/presets/presets/public_transport/station_subway.json b/data/presets/presets/public_transport/station_subway.json
new file mode 100644
index 000000000..fc4c5447a
--- /dev/null
+++ b/data/presets/presets/public_transport/station_subway.json
@@ -0,0 +1,52 @@
+{
+    "icon": "rail-metro",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "subway": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "subway": "yes",
+        "railway": "station",
+        "station": "subway"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/station_train.json b/data/presets/presets/public_transport/station_train.json
new file mode 100644
index 000000000..6d3c1086b
--- /dev/null
+++ b/data/presets/presets/public_transport/station_train.json
@@ -0,0 +1,48 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "train": "yes",
+        "railway": "station"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/station_train_halt.json b/data/presets/presets/public_transport/station_train_halt.json
new file mode 100644
index 000000000..313969b3d
--- /dev/null
+++ b/data/presets/presets/public_transport/station_train_halt.json
@@ -0,0 +1,40 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "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)"
+}
diff --git a/data/presets/presets/public_transport/station_tram.json b/data/presets/presets/public_transport/station_tram.json
new file mode 100644
index 000000000..744a77479
--- /dev/null
+++ b/data/presets/presets/public_transport/station_tram.json
@@ -0,0 +1,42 @@
+{
+    "icon": "rail-light",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "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"
+}
diff --git a/data/presets/presets/public_transport/station_trolleybus.json b/data/presets/presets/public_transport/station_trolleybus.json
new file mode 100644
index 000000000..dd568bdb2
--- /dev/null
+++ b/data/presets/presets/public_transport/station_trolleybus.json
@@ -0,0 +1,51 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "network",
+        "operator",
+        "address",
+        "building_area",
+        "internet_access",
+        "internet_access/fee",
+        "internet_access/ssid"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "public_transport": "station",
+        "trolleybus": "yes"
+    },
+    "addTags": {
+        "public_transport": "station",
+        "trolleybus": "yes",
+        "amenity": "bus_station"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position.json b/data/presets/presets/public_transport/stop_position.json
index cfb163244..b2e3f2bad 100644
--- a/data/presets/presets/public_transport/stop_position.json
+++ b/data/presets/presets/public_transport/stop_position.json
@@ -12,5 +12,12 @@
     "tags": {
         "public_transport": "stop_position"
     },
-    "name": "Stop Position"
+    "terms": [
+        "public transit",
+        "public transportation",
+        "transit",
+        "transportation"
+    ],
+    "name": "Transit Stopping Location",
+    "matchScore": 0.2
 }
diff --git a/data/presets/presets/public_transport/stop_position_aerialway.json b/data/presets/presets/public_transport/stop_position_aerialway.json
new file mode 100644
index 000000000..79b6e149d
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_aerialway.json
@@ -0,0 +1,29 @@
+{
+    "icon": "aerialway",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_bus.json b/data/presets/presets/public_transport/stop_position_bus.json
new file mode 100644
index 000000000..b1977c4ee
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_bus.json
@@ -0,0 +1,28 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_ferry.json b/data/presets/presets/public_transport/stop_position_ferry.json
new file mode 100644
index 000000000..01e639ca7
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_ferry.json
@@ -0,0 +1,31 @@
+{
+    "icon": "ferry",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_light_rail.json b/data/presets/presets/public_transport/stop_position_light_rail.json
new file mode 100644
index 000000000..e2bb0994f
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_light_rail.json
@@ -0,0 +1,43 @@
+{
+    "icon": "rail-light",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "light_rail": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "light_rail": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_monorail.json b/data/presets/presets/public_transport/stop_position_monorail.json
new file mode 100644
index 000000000..3c59a4144
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_monorail.json
@@ -0,0 +1,39 @@
+{
+    "icon": "rail-metro",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "monorail": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "monorail": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_subway.json b/data/presets/presets/public_transport/stop_position_subway.json
new file mode 100644
index 000000000..e797d7f08
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_subway.json
@@ -0,0 +1,42 @@
+{
+    "icon": "rail-metro",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "subway": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "subway": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_train.json b/data/presets/presets/public_transport/stop_position_train.json
new file mode 100644
index 000000000..fb3b651d7
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_train.json
@@ -0,0 +1,40 @@
+{
+    "icon": "rail",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "train": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "train": "yes",
+        "railway": "stop"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_tram.json b/data/presets/presets/public_transport/stop_position_tram.json
new file mode 100644
index 000000000..7d4a24b52
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_tram.json
@@ -0,0 +1,44 @@
+{
+    "icon": "rail-light",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "geometry": [
+        "vertex"
+    ],
+    "tags": {
+        "public_transport": "stop_position",
+        "tram": "yes"
+    },
+    "addTags": {
+        "public_transport": "stop_position",
+        "tram": "yes",
+        "railway": "tram_stop"
+    },
+    "removeTags": {
+        "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"
+}
diff --git a/data/presets/presets/public_transport/stop_position_trolleybus.json b/data/presets/presets/public_transport/stop_position_trolleybus.json
new file mode 100644
index 000000000..5c597c7f2
--- /dev/null
+++ b/data/presets/presets/public_transport/stop_position_trolleybus.json
@@ -0,0 +1,33 @@
+{
+    "icon": "bus",
+    "fields": [
+        "name",
+        "ref_stop_position",
+        "network",
+        "operator"
+    ],
+    "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"
+}
diff --git a/data/presets/presets/railway/halt.json b/data/presets/presets/railway/_halt.json
similarity index 75%
rename from data/presets/presets/railway/halt.json
rename to data/presets/presets/railway/_halt.json
index 20d556396..ad3a5bb61 100644
--- a/data/presets/presets/railway/halt.json
+++ b/data/presets/presets/railway/_halt.json
@@ -7,12 +7,13 @@
     "tags": {
         "railway": "halt"
     },
-    "name": "Railway Halt",
     "terms": [
         "break",
         "interrupt",
         "rest",
         "wait",
         "interruption"
-    ]
+    ],
+    "name": "Train Station (Halt / Request)",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/platform.json b/data/presets/presets/railway/_platform.json
similarity index 80%
rename from data/presets/presets/railway/platform.json
rename to data/presets/presets/railway/_platform.json
index 449c221a0..77aae430a 100644
--- a/data/presets/presets/railway/platform.json
+++ b/data/presets/presets/railway/_platform.json
@@ -14,5 +14,6 @@
     "tags": {
         "railway": "platform"
     },
-    "name": "Railway Platform"
+    "name": "Train Stop / Platform",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/station.json b/data/presets/presets/railway/_station.json
similarity index 88%
rename from data/presets/presets/railway/station.json
rename to data/presets/presets/railway/_station.json
index d6c868a02..3229fa4aa 100644
--- a/data/presets/presets/railway/station.json
+++ b/data/presets/presets/railway/_station.json
@@ -22,5 +22,6 @@
         "train station",
         "station"
     ],
-    "name": "Railway Station"
+    "name": "Train Station",
+    "searchable": false
 }
diff --git a/data/presets/presets/railway/tram_stop.json b/data/presets/presets/railway/_tram_stop.json
similarity index 82%
rename from data/presets/presets/railway/tram_stop.json
rename to data/presets/presets/railway/_tram_stop.json
index 636c6811b..fe334e72b 100644
--- a/data/presets/presets/railway/tram_stop.json
+++ b/data/presets/presets/railway/_tram_stop.json
@@ -17,5 +17,6 @@
         "tram",
         "trolley"
     ],
-    "name": "Tram Stop"
+    "name": "Tram Stopping Position",
+    "searchable": false
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index a77e67f42..2bb7f68d3 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -47,6 +47,10 @@
             "key": "advertising",
             "value": "billboard"
         },
+        {
+            "key": "aerialway",
+            "value": "station"
+        },
         {
             "key": "aerialway",
             "value": "cable_car"
@@ -87,10 +91,6 @@
             "key": "aerialway",
             "value": "rope_tow"
         },
-        {
-            "key": "aerialway",
-            "value": "station"
-        },
         {
             "key": "aerialway",
             "value": "t-bar"
@@ -127,10 +127,18 @@
             "key": "aeroway",
             "value": "terminal"
         },
+        {
+            "key": "amenity",
+            "value": "bus_station"
+        },
         {
             "key": "amenity",
             "value": "coworking_space"
         },
+        {
+            "key": "amenity",
+            "value": "ferry_terminal"
+        },
         {
             "key": "amenity",
             "value": "nursing_home"
@@ -207,10 +215,6 @@
             "key": "amenity",
             "value": "bureau_de_change"
         },
-        {
-            "key": "amenity",
-            "value": "bus_station"
-        },
         {
             "key": "amenity",
             "value": "cafe"
@@ -307,10 +311,6 @@
             "key": "amenity",
             "value": "fast_food"
         },
-        {
-            "key": "amenity",
-            "value": "ferry_terminal"
-        },
         {
             "key": "amenity",
             "value": "fire_station"
@@ -1274,11 +1274,11 @@
         },
         {
             "key": "highway",
-            "value": "bridleway"
+            "value": "bus_stop"
         },
         {
             "key": "highway",
-            "value": "bus_stop"
+            "value": "bridleway"
         },
         {
             "key": "highway",
@@ -2484,14 +2484,146 @@
             "key": "power",
             "value": "transformer"
         },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
         {
             "key": "public_transport",
             "value": "platform"
         },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "subway",
+            "value": "yes"
+        },
+        {
+            "key": "railway",
+            "value": "halt"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
+        {
+            "key": "public_transport",
+            "value": "station"
+        },
+        {
+            "key": "aerialway",
+            "value": "yes"
+        },
+        {
+            "key": "bus",
+            "value": "yes"
+        },
+        {
+            "key": "ferry",
+            "value": "yes"
+        },
+        {
+            "key": "light_rail",
+            "value": "yes"
+        },
+        {
+            "key": "monorail",
+            "value": "yes"
+        },
+        {
+            "key": "subway",
+            "value": "yes"
+        },
+        {
+            "key": "train",
+            "value": "yes"
+        },
+        {
+            "key": "tram",
+            "value": "yes"
+        },
+        {
+            "key": "trolleybus",
+            "value": "yes"
+        },
         {
             "key": "public_transport",
             "value": "stop_position"
         },
+        {
+            "key": "railway",
+            "value": "halt"
+        },
+        {
+            "key": "railway",
+            "value": "platform"
+        },
+        {
+            "key": "railway",
+            "value": "station"
+        },
+        {
+            "key": "railway",
+            "value": "tram_stop"
+        },
         {
             "key": "railway",
             "value": "abandoned"
@@ -2516,10 +2648,6 @@
             "key": "railway",
             "value": "funicular"
         },
-        {
-            "key": "railway",
-            "value": "halt"
-        },
         {
             "key": "railway",
             "value": "level_crossing"
@@ -2544,10 +2672,6 @@
             "key": "railway",
             "value": "narrow_gauge"
         },
-        {
-            "key": "railway",
-            "value": "platform"
-        },
         {
             "key": "railway",
             "value": "rail"
@@ -2556,10 +2680,6 @@
             "key": "railway",
             "value": "signal"
         },
-        {
-            "key": "railway",
-            "value": "station"
-        },
         {
             "key": "railway",
             "value": "subway_entrance"
@@ -2576,10 +2696,6 @@
             "key": "railway",
             "value": "wash"
         },
-        {
-            "key": "railway",
-            "value": "tram_stop"
-        },
         {
             "key": "railway",
             "value": "tram"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 36b81d618..e2608a9ed 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2648,6 +2648,10 @@
                     "name": "Billboard",
                     "terms": ""
                 },
+                "aerialway/station": {
+                    "name": "Aerialway Station",
+                    "terms": ""
+                },
                 "aerialway/cable_car": {
                     "name": "Cable Car",
                     "terms": "tramway,ropeway"
@@ -2688,10 +2692,6 @@
                     "name": "Rope Tow Lift",
                     "terms": "handle tow,bugel lift"
                 },
-                "aerialway/station": {
-                    "name": "Aerialway Station",
-                    "terms": ""
-                },
                 "aerialway/t-bar": {
                     "name": "T-bar Lift",
                     "terms": "tbar"
@@ -2728,10 +2728,18 @@
                     "name": "Airport Terminal",
                     "terms": "airport,aerodrome"
                 },
+                "amenity/bus_station": {
+                    "name": "Bus Station / Terminal",
+                    "terms": ""
+                },
                 "amenity/coworking_space": {
                     "name": "Coworking Space",
                     "terms": ""
                 },
+                "amenity/ferry_terminal": {
+                    "name": "Ferry Station / Terminal",
+                    "terms": ""
+                },
                 "amenity/nursing_home": {
                     "name": "Nursing Home",
                     "terms": ""
@@ -2808,10 +2816,6 @@
                     "name": "Currency Exchange",
                     "terms": "bureau de change,money changer"
                 },
-                "amenity/bus_station": {
-                    "name": "Bus Station",
-                    "terms": ""
-                },
                 "amenity/cafe": {
                     "name": "Cafe",
                     "terms": "bistro,coffee,tea"
@@ -2908,10 +2912,6 @@
                     "name": "Fast Food",
                     "terms": "restaurant,takeaway"
                 },
-                "amenity/ferry_terminal": {
-                    "name": "Ferry Terminal",
-                    "terms": ""
-                },
                 "amenity/fire_station": {
                     "name": "Fire Station",
                     "terms": ""
@@ -3880,14 +3880,14 @@
                     "name": "Speech Therapist",
                     "terms": "speech,therapist,therapy,voice"
                 },
+                "highway/bus_stop": {
+                    "name": "Bus Stop / Platform",
+                    "terms": ""
+                },
                 "highway/bridleway": {
                     "name": "Bridle Path",
                     "terms": "bridleway,equestrian,horse"
                 },
-                "highway/bus_stop": {
-                    "name": "Bus Stop",
-                    "terms": ""
-                },
                 "highway/corridor": {
                     "name": "Indoor Corridor",
                     "terms": "gallery,hall,hallway,indoor,passage,passageway"
@@ -5108,14 +5108,146 @@
                     "name": "Transformer",
                     "terms": ""
                 },
+                "public_transport/platform_aerialway": {
+                    "name": "Aerialway Stop / Platform",
+                    "terms": "aerialway,cable car,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_bus": {
+                    "name": "Bus Stop / Platform",
+                    "terms": "bus,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_ferry": {
+                    "name": "Ferry Stop / Platform",
+                    "terms": "boat,dock,ferry,pier,platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/platform_light_rail": {
+                    "name": "Light Rail Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/platform_monorail": {
+                    "name": "Monorail Stop / Platform",
+                    "terms": "monorail,platform,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/platform_subway": {
+                    "name": "Subway Stop / Platform",
+                    "terms": "metro,platform,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/platform_train": {
+                    "name": "Train Stop / Platform",
+                    "terms": "platform,public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/platform_tram": {
+                    "name": "Tram Stop / Platform",
+                    "terms": "electric,light rail,platform,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/platform_trolleybus": {
+                    "name": "Trolleybus Stop / Platform",
+                    "terms": "bus,electric,platform,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
+                },
                 "public_transport/platform": {
-                    "name": "Platform",
-                    "terms": ""
+                    "name": "Transit Stop / Platform",
+                    "terms": "platform,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/station_aerialway": {
+                    "name": "Aerialway Station",
+                    "terms": "aerialway,cable car,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_bus": {
+                    "name": "Bus Station / Terminal",
+                    "terms": "bus,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_ferry": {
+                    "name": "Ferry Station / Terminal",
+                    "terms": "boat,dock,ferry,pier,public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/station_light_rail": {
+                    "name": "Light Rail Station",
+                    "terms": "electric,light rail,public transit,public transportation,rail,station,terminal,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/station_monorail": {
+                    "name": "Train Station",
+                    "terms": "monorail,public transit,public transportation,rail,station,terminal,transit,transportation"
+                },
+                "public_transport/station_subway": {
+                    "name": "Subway Station",
+                    "terms": "metro,public transit,public transportation,rail,station,subway,terminal,track,transit,transportation,underground"
+                },
+                "public_transport/station_train_halt": {
+                    "name": "Train Station (Halt / Request)",
+                    "terms": "halt,public transit,public transportation,rail,station,track,train,transit,transportation,whistle stop"
+                },
+                "public_transport/station_train": {
+                    "name": "Train Station",
+                    "terms": "public transit,public transportation,rail,station,terminal,track,train,transit,transportation"
+                },
+                "public_transport/station_tram": {
+                    "name": "Tram Station",
+                    "terms": "electric,light rail,public transit,public transportation,rail,station,streetcar,terminal,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/station_trolleybus": {
+                    "name": "Trolleybus Station / Terminal",
+                    "terms": "bus,electric,public transit,public transportation,station,streetcar,terminal,trackless,tram,trolley,transit,transportation"
+                },
+                "public_transport/station": {
+                    "name": "Transit Station",
+                    "terms": "public transit,public transportation,station,terminal,transit,transportation"
+                },
+                "public_transport/stop_position_aerialway": {
+                    "name": "Aerialway Stopping Location",
+                    "terms": "aerialway,cable car,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_bus": {
+                    "name": "Bus Stopping Location",
+                    "terms": "bus,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_ferry": {
+                    "name": "Ferry Stopping Location",
+                    "terms": "boat,dock,ferry,pier,public transit,public transportation,transit,transportation"
+                },
+                "public_transport/stop_position_light_rail": {
+                    "name": "Light Rail Stopping Location",
+                    "terms": "electric,light rail,public transit,public transportation,rail,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/stop_position_monorail": {
+                    "name": "Monorail Stopping Location",
+                    "terms": "monorail,public transit,public transportation,rail,transit,transportation"
+                },
+                "public_transport/stop_position_subway": {
+                    "name": "Subway Stopping Location",
+                    "terms": "metro,public transit,public transportation,rail,subway,track,transit,transportation,underground"
+                },
+                "public_transport/stop_position_train": {
+                    "name": "Train Stopping Location",
+                    "terms": "public transit,public transportation,rail,track,train,transit,transportation"
+                },
+                "public_transport/stop_position_tram": {
+                    "name": "Tram Stopping Location",
+                    "terms": "electric,light rail,public transit,public transportation,rail,streetcar,track,tram,trolley,transit,transportation"
+                },
+                "public_transport/stop_position_trolleybus": {
+                    "name": "Trolleybus Stopping Location",
+                    "terms": "bus,electric,public transit,public transportation,streetcar,trackless,tram,trolley,transit,transportation"
                 },
                 "public_transport/stop_position": {
-                    "name": "Stop Position",
+                    "name": "Transit Stopping Location",
+                    "terms": "public transit,public transportation,transit,transportation"
+                },
+                "railway/halt": {
+                    "name": "Train Station (Halt / Request)",
+                    "terms": "break,interrupt,rest,wait,interruption"
+                },
+                "railway/platform": {
+                    "name": "Train Stop / Platform",
                     "terms": ""
                 },
+                "railway/station": {
+                    "name": "Train Station",
+                    "terms": "train station,station"
+                },
+                "railway/tram_stop": {
+                    "name": "Tram Stopping Position",
+                    "terms": "light rail,streetcar,tram,trolley"
+                },
                 "railway/abandoned": {
                     "name": "Abandoned Railway",
                     "terms": ""
@@ -5140,10 +5272,6 @@
                     "name": "Funicular",
                     "terms": "venicular,cliff railway,cable car,cable railway,funicular railway"
                 },
-                "railway/halt": {
-                    "name": "Railway Halt",
-                    "terms": "break,interrupt,rest,wait,interruption"
-                },
                 "railway/level_crossing": {
                     "name": "Railway Crossing (Road)",
                     "terms": "crossing,railroad crossing,level crossing,grade crossing,road through railroad,train crossing"
@@ -5168,10 +5296,6 @@
                     "name": "Narrow Gauge Rail",
                     "terms": "narrow gauge railway,narrow gauge railroad"
                 },
-                "railway/platform": {
-                    "name": "Railway Platform",
-                    "terms": ""
-                },
                 "railway/rail": {
                     "name": "Rail",
                     "terms": ""
@@ -5180,10 +5304,6 @@
                     "name": "Railway Signal",
                     "terms": "signal,lights"
                 },
-                "railway/station": {
-                    "name": "Railway Station",
-                    "terms": "train station,station"
-                },
                 "railway/subway_entrance": {
                     "name": "Subway Entrance",
                     "terms": "metro,transit"
@@ -5200,10 +5320,6 @@
                     "name": "Train Wash",
                     "terms": "wash,clean"
                 },
-                "railway/tram_stop": {
-                    "name": "Tram Stop",
-                    "terms": "light rail,streetcar,tram,trolley"
-                },
                 "railway/tram": {
                     "name": "Tram",
                     "terms": "light rail,streetcar,tram,trolley"