diff --git a/data/presets.yaml b/data/presets.yaml
index fba8426f12..21f0c7e3f8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3718,10 +3718,12 @@ en:
       railway/subway:
         # railway=subway
         name: Subway
+        # 'terms: metro,transit'
         terms: '<translate with synonyms or related terms for ''Subway'', separated by commas>'
       railway/subway_entrance:
         # railway=subway_entrance
         name: Subway Entrance
+        # 'terms: metro,transit'
         terms: '<translate with synonyms or related terms for ''Subway Entrance'', separated by commas>'
       railway/tram:
         # railway=tram
diff --git a/data/presets/presets.json b/data/presets/presets.json
index f95930c5f4..b445ae1a5e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -10202,12 +10202,16 @@
         "railway/subway_entrance": {
             "icon": "entrance",
             "geometry": [
-                "point"
+                "point",
+                "vertex"
             ],
             "tags": {
                 "railway": "subway_entrance"
             },
-            "terms": [],
+            "terms": [
+                "metro",
+                "transit"
+            ],
             "name": "Subway Entrance"
         },
         "railway/subway": {
@@ -10224,7 +10228,10 @@
                 "electrified",
                 "service_rail"
             ],
-            "terms": [],
+            "terms": [
+                "metro",
+                "transit"
+            ],
             "name": "Subway"
         },
         "railway/tram_stop": {
diff --git a/data/presets/presets/railway/subway.json b/data/presets/presets/railway/subway.json
index 9cf652236e..abacc3ed25 100644
--- a/data/presets/presets/railway/subway.json
+++ b/data/presets/presets/railway/subway.json
@@ -12,6 +12,9 @@
         "electrified",
         "service_rail"
     ],
-    "terms": [],
+    "terms": [
+        "metro",
+        "transit"
+    ],
     "name": "Subway"
 }
diff --git a/data/presets/presets/railway/subway_entrance.json b/data/presets/presets/railway/subway_entrance.json
index 687d7a904c..1b46f10d05 100644
--- a/data/presets/presets/railway/subway_entrance.json
+++ b/data/presets/presets/railway/subway_entrance.json
@@ -1,11 +1,15 @@
 {
     "icon": "entrance",
     "geometry": [
-        "point"
+        "point",
+        "vertex"
     ],
     "tags": {
         "railway": "subway_entrance"
     },
-    "terms": [],
+    "terms": [
+        "metro",
+        "transit"
+    ],
     "name": "Subway Entrance"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index fd84a70a02..b010533d67 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4369,11 +4369,11 @@
                 },
                 "railway/subway_entrance": {
                     "name": "Subway Entrance",
-                    "terms": ""
+                    "terms": "metro,transit"
                 },
                 "railway/subway": {
                     "name": "Subway",
-                    "terms": ""
+                    "terms": "metro,transit"
                 },
                 "railway/tram_stop": {
                     "name": "Tram Stop",