Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18182)
+++ trunk/resources/data/defaultpresets.xml	(revision 18184)
@@ -252,10 +252,10 @@
         <combo key="fee" text="Fee" delimiter="|" values="yes|no|06:00-20:00|Mo-Fr 09:00-18:00,Sa 08:00-14:00|May-Sep 09:30-12:30,14:15-19:30" values_no_i18n="true" values_sort="false" />
     </chunk>
-    <chunk id="parking_name_type_ref">
+    <chunk id="parking_name_ref">
+        <combo key="parking" text="Type of parking" values="carports,garage_boxes,lane,multi-storey,rooftop,sheds,street_side,surface,underground" values_context="parking" />
         <text key="name" text="Name" />
-        <combo key="parking" text="Type" values="carports,garage_boxes,lane,multi-storey,rooftop,sheds,street_side,surface,underground" values_context="parking" />
         <text key="ref" text="Reference number" />
     </chunk>
-    <chunk id="parking_access_fee_operator_surface_smoothness">
+    <chunk id="access_fee_operator_surface_smoothness">
         <space />
         <reference ref="POI_access" />
@@ -2557,8 +2557,8 @@
             <space />
             <key key="amenity" value="parking" />
-            <reference ref="parking_name_type_ref" />
+            <reference ref="parking_name_ref" />
             <text key="maxheight" text="Max. height (meters)" />
             <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" />
-            <reference ref="parking_access_fee_operator_surface_smoothness" />
+            <reference ref="access_fee_operator_surface_smoothness" />
             <space />
             <text key="capacity" text="Capacity (overall)" />
@@ -2578,7 +2578,8 @@
             <space />
             <key key="amenity" value="parking_space" />
-            <reference ref="parking_name_type_ref" />
+            <combo key="parking_space" text="Type of parking space" values="disabled,normal" />
+            <reference ref="parking_name_ref" />
             <text key="capacity" text="Capacity" />
-            <reference ref="parking_access_fee_operator_surface_smoothness" />
+            <reference ref="access_fee_operator_surface_smoothness" />
             <reference ref="maxstay" />
             <reference ref="supervised_lit_oh" />
@@ -2589,7 +2590,7 @@
             <space />
             <key key="amenity" value="parking_entrance" />
-            <reference ref="parking_name_type_ref" />
+            <reference ref="parking_name_ref" />
             <text key="maxheight" text="Max. height (meters)" />
-            <reference ref="parking_access_fee_operator_surface_smoothness" />
+            <reference ref="access_fee_operator_surface_smoothness" />
             <reference ref="supervised_lit_oh" />
             <check key="covered" text="Covered (with roof)" />
@@ -2766,7 +2767,7 @@
             <space />
             <key key="amenity" value="motorcycle_parking" />
-            <reference ref="parking_name_type_ref" />
+            <reference ref="parking_name_ref" />
             <text key="capacity" text="Capacity" />
-            <reference ref="parking_access_fee_operator_surface_smoothness" />
+            <reference ref="access_fee_operator_surface_smoothness" />
             <reference ref="supervised_lit_oh" />
             <reference ref="maxstay" />
@@ -2805,5 +2806,5 @@
             <text key="name" text="Name" />
             <text key="capacity" text="Capacity" />
-            <reference ref="parking_access_fee_operator_surface_smoothness" />
+            <reference ref="access_fee_operator_surface_smoothness" />
             <check key="covered" text="Covered" />
             <reference ref="supervised_lit_oh" />