diff --git a/data/presets.yaml b/data/presets.yaml
index e7e1c6182..13fabfdf3 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2755,6 +2755,11 @@ en:
         name: Multilevel Parking Garage
         # 'terms: car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure'
         terms: '<translate with synonyms or related terms for ''Multilevel Parking Garage'', separated by commas>'
+      amenity/parking/underground:
+        # 'amenity=parking, parking=underground'
+        name: Underground Parking
+        # 'terms: automobile parking,car lot,car parking,rv parking,subsurface parking,truck parking,vehicle parking'
+        terms: '<translate with synonyms or related terms for ''Underground Parking'', separated by commas>'
       amenity/parking_entrance:
         # amenity=parking_entrance
         name: Parking Garage Entrance/Exit
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 5336c4b5f..5c871bad0 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -131,8 +131,9 @@
     "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"},
     "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"},
     "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"},
-    "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "surface"], "moreFields": ["name", "supervised", "park_ride", "maxstay", "payment_multi_fee", "address", "website", "phone", "email", "fax", "wheelchair", "covered"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
+    "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "park_ride", "payment_multi_fee", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"},
     "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["{amenity/parking}", "building", "levels", "height"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "removeTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"},
+    "amenity/parking/underground": {"icon": "maki-car", "fields": ["{amenity/parking}", "layer"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "removeTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "name": "Underground Parking"},
     "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"},
     "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"},
     "amenity/pharmacy": {"icon": "maki-pharmacy", "fields": ["name", "operator", "address", "building_area", "drive_through", "dispensing"], "moreFields": ["opening_hours", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "pharmacy"}, "addTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "removeTags": {"amenity": "pharmacy", "healthcare": "pharmacy"}, "reference": {"key": "amenity", "value": "pharmacy"}, "terms": ["apothecary", "drug store", "drugstore", "med*", "prescription"], "name": "Pharmacy Counter"},
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index eb75d854e..8e391d09d 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -9,18 +9,19 @@
         "surface"
     ],
     "moreFields": [
-        "name",
-        "supervised",
-        "park_ride",
-        "maxstay",
-        "payment_multi_fee",
         "address",
-        "website",
-        "phone",
+        "covered",
         "email",
         "fax",
-        "wheelchair",
-        "covered"
+        "maxstay",
+        "name",
+        "park_ride",
+        "payment_multi_fee",
+        "phone",
+        "ref",
+        "supervised",
+        "website",
+        "wheelchair"
     ],
     "geometry": [
         "point",
diff --git a/data/presets/presets/amenity/parking/underground.json b/data/presets/presets/amenity/parking/underground.json
new file mode 100644
index 000000000..4105bb298
--- /dev/null
+++ b/data/presets/presets/amenity/parking/underground.json
@@ -0,0 +1,40 @@
+{
+    "icon": "maki-car",
+    "fields": [
+        "{amenity/parking}",
+        "layer"
+    ],
+    "geometry": [
+        "point",
+        "vertex",
+        "area"
+    ],
+    "tags": {
+        "amenity": "parking",
+        "parking": "underground"
+    },
+    "addTags": {
+        "amenity": "parking",
+        "parking": "underground",
+        "layer": "-1"
+    },
+    "removeTags": {
+        "amenity": "parking",
+        "parking": "underground",
+        "layer": "-1"
+    },
+    "reference": {
+        "key": "parking",
+        "value": "underground"
+    },
+    "terms": [
+        "automobile parking",
+        "car lot",
+        "car parking",
+        "rv parking",
+        "subsurface parking",
+        "truck parking",
+        "vehicle parking"
+    ],
+    "name": "Underground Parking"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 8bcb8df02..4eca977e0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -134,6 +134,7 @@
     {"key": "amenity", "value": "parking_space", "description": "🄿 Parking Space", "object_types": ["node", "area"]},
     {"key": "amenity", "value": "parking", "description": "🄿 Parking Lot", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "parking", "value": "multi-storey", "description": "🄿 Multilevel Parking Garage, 🄵 Type", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
+    {"key": "parking", "value": "underground", "description": "🄿 Underground Parking, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"},
     {"key": "amenity", "value": "payment_centre", "description": "🄿 Payment Center", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/bank-15.svg?sanitize=true"},
     {"key": "amenity", "value": "payment_terminal", "description": "🄿 Payment Terminal", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/openstreetmap/iD/master/svg/fontawesome/far-credit-card.svg?sanitize=true"},
     {"key": "amenity", "value": "pharmacy", "description": "🄿 Pharmacy Counter", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/pharmacy-15.svg?sanitize=true"},
@@ -1449,7 +1450,6 @@
     {"key": "par", "description": "🄵 Par"},
     {"key": "park_ride", "description": "🄵 Park and Ride"},
     {"key": "parking", "value": "surface", "description": "🄵 Type"},
-    {"key": "parking", "value": "underground", "description": "🄵 Type"},
     {"key": "parking", "value": "sheds", "description": "🄵 Type"},
     {"key": "parking", "value": "carports", "description": "🄵 Type"},
     {"key": "parking", "value": "garage_boxes", "description": "🄵 Type"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 316447382..f1d0005e2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -4615,6 +4615,10 @@
                     "name": "Multilevel Parking Garage",
                     "terms": "car,indoor parking,multistorey car park,parkade,parking building,parking deck,parking garage,parking ramp,parking structure"
                 },
+                "amenity/parking/underground": {
+                    "name": "Underground Parking",
+                    "terms": "automobile parking,car lot,car parking,rv parking,subsurface parking,truck parking,vehicle parking"
+                },
                 "amenity/payment_centre": {
                     "name": "Payment Center",
                     "terms": "check,tax pay,bill pay,currency,finance,cash,money"