diff --git a/data/locales.js b/data/locales.js
index 569d571da..896b06cd0 100644
--- a/data/locales.js
+++ b/data/locales.js
@@ -4210,6 +4210,12 @@ locale.en = {
             "operator": {
                 "label": "Operator"
             },
+            "park_ride": {
+                "label": "Park and Ride"
+            },
+            "parking": {
+                "label": "Type"
+            },
             "phone": {
                 "label": "Phone"
             },
@@ -4261,6 +4267,9 @@ locale.en = {
                     "cutting": "Cutting"
                 }
             },
+            "supervised": {
+                "label": "Supervised"
+            },
             "surface": {
                 "label": "Surface"
             },
diff --git a/data/locales/en.js b/data/locales/en.js
index 8e1033868..7275a545c 100644
--- a/data/locales/en.js
+++ b/data/locales/en.js
@@ -482,6 +482,12 @@ locale.en = {
             "operator": {
                 "label": "Operator"
             },
+            "park_ride": {
+                "label": "Park and Ride"
+            },
+            "parking": {
+                "label": "Type"
+            },
             "phone": {
                 "label": "Phone"
             },
@@ -533,6 +539,9 @@ locale.en = {
                     "cutting": "Cutting"
                 }
             },
+            "supervised": {
+                "label": "Supervised"
+            },
             "surface": {
                 "label": "Surface"
             },
diff --git a/data/presets.yaml b/data/presets.yaml
index 940b9fd12..494702fe8 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -121,6 +121,10 @@ en:
         label: Hours
       operator: 
         label: Operator
+      park_ride: 
+        label: Park and Ride
+      parking: 
+        label: Type
       phone: 
         label: Phone
       place: 
@@ -158,6 +162,8 @@ en:
           tunnel: Tunnel
           embankment: Embankment
           cutting: Cutting
+      supervised: 
+        label: Supervised
       surface: 
         label: Surface
       tourism: 
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 7fb6e77a5..e0830ec58 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -290,6 +290,25 @@
         "type": "text",
         "label": "Operator"
     },
+    "park_ride": {
+        "key": "park_ride",
+        "type": "check",
+        "label": "Park and Ride"
+    },
+    "parking": {
+        "key": "parking",
+        "type": "combo",
+        "options": [
+            "surface",
+            "multi-storey",
+            "underground",
+            "sheds",
+            "carports",
+            "garage_boxes",
+            "lane"
+        ],
+        "label": "Type"
+    },
     "phone": {
         "key": "phone",
         "type": "tel",
@@ -394,6 +413,11 @@
             }
         }
     },
+    "supervised": {
+        "key": "supervised",
+        "type": "check",
+        "label": "Supervised"
+    },
     "surface": {
         "key": "surface",
         "type": "combo",
diff --git a/data/presets/fields/park_ride.json b/data/presets/fields/park_ride.json
index 4797e508a..bdb6713a1 100644
--- a/data/presets/fields/park_ride.json
+++ b/data/presets/fields/park_ride.json
@@ -1,5 +1,5 @@
 {
     "key": "park_ride",
     "type": "check",
-    "label": "Park and ride"
+    "label": "Park and Ride"
 }
diff --git a/data/presets/fields/parking.json b/data/presets/fields/parking.json
index 9463e6bb3..c287a4050 100644
--- a/data/presets/fields/parking.json
+++ b/data/presets/fields/parking.json
@@ -1,6 +1,6 @@
 {
     "key": "parking",
-    "type": "radio",
+    "type": "combo",
     "options": [
         "surface",
         "multi-storey",
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 150c44a5c..49172b371 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -381,8 +381,11 @@
     "amenity/parking": {
         "icon": "parking",
         "fields": [
+            "parking",
+            "capacity",
             "fee",
-            "access",
+            "supervised",
+            "park_ride",
             "address"
         ],
         "geometry": [
diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json
index 9199e4365..9991c0546 100644
--- a/data/presets/presets/amenity/parking.json
+++ b/data/presets/presets/amenity/parking.json
@@ -1,11 +1,10 @@
 {
     "icon": "parking",
     "fields": [
-        "fee",
-        "access",
         "parking",
-        "supervised",
         "capacity",
+        "fee",
+        "supervised",
         "park_ride",
         "address"
     ],