Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 6700)
+++ trunk/data/defaultpresets.xml	(revision 6701)
@@ -299,4 +299,25 @@
         <check key="payment:account_cards" text="Account or loyalty cards" />
     </chunk>
+    <chunk id="parking_name_type_ref">
+        <text key="name" text="Name" />
+        <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
+        <text key="ref" text="Reference number" />
+    </chunk>
+    <chunk id="parking_access_fee_operator_surface">
+        <space />
+        <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
+        <combo key="fee" text="Fee" values="yes,no,interval" />
+        <text key="operator" text="Operator" />
+        <reference ref="surface" />
+        <space />
+    </chunk>
+    <chunk id="stay">
+        <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
+    </chunk>
+    <chunk id="supervised_lit_oh">
+        <combo key="supervised" text="Supervised" values="yes,no,interval" />
+        <combo key="lit" text="Lit" values="yes,no,interval" />
+        <reference ref="oh" />
+    </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact">
@@ -2288,13 +2309,8 @@
             <space />
             <key key="amenity" value="parking" />
-            <text key="name" text="Name" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-            <text key="ref" text="Reference number" />
+            <reference ref="parking_name_type_ref" />
             <text key="maxheight" text="Max. height (meters)" />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
-            <combo key="park_ride" text="Park and Ride" values="yes,no" />
-            <combo key="fee" text="Fee" values="yes,no" />
-            <text key="operator" text="Operator" />
-            <space />
+            <combo key="park_ride" text="Park and Ride" values="yes,no,bus,train,tram,metro,ferry" />
+            <reference ref="parking_access_fee_operator_surface" />
             <text key="capacity" text="Capacity (overall)" />
             <combo key="capacity:disabled" text="Spaces for Disabled" values="yes,no,unknown,1,2,3" />
@@ -2302,4 +2318,7 @@
             <combo key="capacity:parent" text="Spaces for Parents" values="yes,no,unknown,1,2,3" />
             <label text="See the Wiki for other capacity:[types]=*." />
+            <space />
+            <reference ref="stay" />
+            <reference ref="supervised_lit_oh" />
         </item>
         <item name="Parking space" icon="presets/parking.png" type="node,closedway">
@@ -2313,18 +2332,10 @@
             <space />
             <key key="amenity" value="parking_space" />
-            <text key="name" text="Name" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-            <text key="ref" text="Reference number" />
+            <reference ref="parking_name_type_ref" />
             <text key="capacity" text="Capacity" />
-            <space />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
-            <combo key="fee" text="Fee" values="yes,no,interval" />
-            <text key="operator" text="Operator" />
-            <reference ref="surface" />
-            <combo key="covered" text="Covered (with roof)" values="yes,no" />
-            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
-            <combo key="supervised" text="Supervised" values="yes,no,interval" />
-            <combo key="lit" text="Lit" values="yes,no,interval" />
-            <reference ref="oh" />
+            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="stay" />
+            <reference ref="supervised_lit_oh" />
+            <check key="covered" text="Covered (with roof)" />
         </item>
         <item name="Parking entrance" icon="presets/parking.png" type="node">
@@ -2337,17 +2348,9 @@
             <space />
             <key key="amenity" value="parking_entrance" />
-            <text key="name" text="Name" />
-            <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" />
-            <text key="ref" text="Reference number" />
-            <space />
-            <combo key="access" text="Access" values="yes,private,customers,permissive,no" />
-            <combo key="fee" text="Fee" values="yes,no,interval" />
-            <text key="operator" text="Operator" />
-            <reference ref="surface" />
-            <combo key="covered" text="Covered (with roof)" values="yes,no" />
-            <combo key="stay" text="Time Limit (minutes)" values="0,30-60,30-180,30+" />
-            <combo key="supervised" text="Supervised" values="yes,no,interval" />
-            <combo key="lit" text="Lit" values="yes,no,interval" />
-            <reference ref="oh" />
+            <reference ref="parking_name_type_ref" />
+            <text key="maxheight" text="Max. height (meters)" />
+            <reference ref="parking_access_fee_operator_surface" />
+            <reference ref="supervised_lit_oh" />
+            <check key="covered" text="Covered (with roof)" />
         </item>
         <separator/>
@@ -3545,6 +3548,6 @@
             <key key="amenity" value="bbq" />
             <text key="name" text="Name" />
-            <combo key="covered" text="Covered" values="yes,no" />
             <combo key="fuel" text="Fuel" text_context="grill" values="charcoal,electric,wood" />
+            <check key="covered" text="Covered" />
         </item>
         <item name="Fishing" icon="presets/fishing.png" type="node,closedway">