Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml    (revision 16702)
+++ resources/data/defaultpresets.xml    (working copy)
@@ -217,6 +217,22 @@
     <chunk id="fee_interval">
         <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="oh_fee">
+        <reference ref="oh" />
+        <reference ref="fee" />
+    </chunk>
+    <chunk id="duration">
+        <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
+    </chunk>
+    <chunk id="interval">
+        <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30,00:02:30" values_no_i18n="true" />
+    </chunk>
+    <chunk id="oh_duration_interval_fee_">
+        <reference ref="oh" />
+        <reference ref="duration" />
+        <reference ref="interval" />
+        <reference ref="fee" />
+    </chunk>
     <chunk id="parking_name_type_ref">
         <text key="name" text="Name" />
         <combo key="parking" text="Type" values="multi-storey,surface,underground,rooftop" values_context="parking" />
@@ -264,6 +280,7 @@
         <check key="roundtrip" text="Roundtrip"/>
         <text key="symbol" text="Symbol description"/>
         <text key="description" text="Description"/>
+        <text key="website" text="Website" />
     </chunk>
     <chunk id="genus_species_taxon">
         <text key="genus" text="Genus" />
@@ -502,8 +519,8 @@
     <text key="network" text="Network" />
     <text key="description" text="Description" />
     <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
-    <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-    <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
+    <reference ref="oh_duration_interval_fee_" />
+    <text key="website" text="Website" />
   </chunk>
   <chunk id="climbing_styles">
     <label text="Climbing styles:" />
@@ -533,6 +550,32 @@
       <reference ref="POI_access" />
     </optional>
   </chunk>
+    <chunk id="aerialway_capacity">
+        <text key="aerialway:capacity" text="Number of people per hour" />
+    </chunk>
+    <chunk id="aerialway_duration">
+        <text key="aerialway:duration" text="Typical journey time in minutes" />
+    </chunk>
+    <chunk id="aerialway_capacity_duration">
+        <optional>
+            <reference ref="aerialway_capacity" />
+            <reference ref="aerialway_duration" />
+            <reference ref="oh_fee" />
+        </optional>
+    </chunk>
+    <chunk id="aerialway_optionals">
+        <reference ref="aerialway_capacity" />
+        <text key="aerialway:occupancy" text="Number of people per car" />
+        <reference ref="aerialway_duration" />
+        <check key="aerialway:heating" text="Has heating?" />
+    </chunk>
+    <chunk id="aerialway_optionals_bubble">
+        <optional>
+            <reference ref="aerialway_optionals" />
+            <check key="aerialway:bubble" text="Has bubble?" />
+            <reference ref="oh_fee" />
+        </optional>
+    </chunk>
   <!--  Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
     <group name="Streets" icon="presets/transport/way/way_secondary.svg">
@@ -1862,11 +1905,9 @@
             <key key="route" value="ferry" />
             <optional>
                 <reference ref="name_ref_operator" />
-                <reference ref="oh_wheelchair" />
+                <reference ref="wheelchair" />
                 <space />
-                <combo key="duration" text="Duration (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-                <combo key="interval" text="Interval (M, MM, HH:MM, or HH:MM:SS)" values="5,10,15,20,30,60,120,10:30" values_no_i18n="true" />
-                <reference ref="fee" />
+                <reference ref="oh_duration_interval_fee_" />
                 <combo key="ferry" text="Highway type the ferry connects" values="trunk,primary,secondary,tertiary,unclassified" values_context="Highway" values_sort="false" />
                 <check key="ferry:cable" text="Reaction ferry" />
             </optional>
@@ -2110,91 +2151,69 @@
             <link wiki="Tag:aerialway=cable_car" />
             <space />
             <key key="aerialway" value="cable_car" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:occupancy" text="Number of people per car" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:heating" text="Has heating?" />
+            <reference ref="name_ref_operator" />
+            <optional>
+                <reference ref="aerialway_optionals" />
+                <reference ref="oh_fee" />
             </optional>
         </item> <!-- Cable Car -->
         <item name="Chair Lift" icon="presets/transport/aerialway/chair_lift.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=chair_lift" />
             <space />
             <key key="aerialway" value="chair_lift" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:occupancy" text="Number of people per chair" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" />
-                <check key="aerialway:heating" text="Has heating?" />
-            </optional>
+            <reference ref="name_ref_operator" />
+            <reference ref="aerialway_optionals_bubble" />
         </item> <!-- Chair Lift -->
         <item name="Gondola" icon="presets/transport/aerialway/gondola.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=gondola" />
             <space />
             <key key="aerialway" value="gondola" />
-            <reference ref="name_ref" />
+            <reference ref="name_ref_operator" />
             <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:occupancy" text="Number of people per gondola" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:heating" text="Has heating?" />
+                <reference ref="aerialway_optionals" />
+                <reference ref="oh_fee" />
             </optional>
         </item> <!-- Gondola -->
         <item name="Mixed Lift" icon="presets/transport/aerialway/mixed_lift.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=mixed_lift" />
             <space />
             <key key="aerialway" value="mixed_lift" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:occupancy" text="Number of people per gondola/chair" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-                <check key="aerialway:bubble" text="Has bubble?" />
-                <check key="aerialway:heating" text="Has heating?" />
-            </optional>
+            <reference ref="name_ref_operator" />
+            <reference ref="aerialway_optionals_bubble" />
         </item> <!-- Mixed Lift -->
         <item name="Drag Lift" icon="presets/transport/aerialway/drag_lift.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=drag_lift" />
             <space />
             <combo key="aerialway" text="Type" values="drag_lift,t-bar,j-bar,platter,rope_tow" display_values="drag_lift (general type - use only if exact type (see values below) is unknown),t-bar,j-bar,platter,rope_tow" match="keyvalue" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-            </optional>
+            <reference ref="name_ref_operator" />
+            <reference ref="aerialway_capacity_duration" />
         </item> <!-- Drag Lift -->
         <item name="Magic Carpet" icon="presets/transport/aerialway/magic_carpet.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=magic_carpet" />
             <space />
             <key key="aerialway" value="magic_carpet" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:capacity" text="Number of people per hour" />
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
-            </optional>
+            <reference ref="name_ref_operator" />
+            <reference ref="aerialway_capacity_duration" />
         </item> <!-- Magic Carpet -->
         <item name="Goods" icon="presets/transport/aerialway/goods.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=goods" />
             <space />
             <key key="aerialway" value="goods" />
-            <reference ref="name_ref" />
-            <optional>
-                <text key="aerialway:duration" text="Typical journey time in minutes" />
+            <reference ref="name_ref_operator" />
+            <optional>
+                <reference ref="aerialway_duration" />    
+                <reference ref="fee" />
             </optional>
         </item> <!-- Goods -->
         <item name="Zip line" icon="presets/transport/aerialway/zip_line.svg" type="way" preset_name_label="true">
             <link wiki="Tag:aerialway=zip_line" />
             <space />
             <key key="aerialway" value="zip_line" />
+            <reference ref="name_ref_operator" />
             <optional>
-                <reference ref="name_ref_operator" />
-                <reference ref="oh" />
-                <reference ref="fee" />
                 <reference ref="min_age" />
                 <text key="maxweight" text="Max. weight (tonnes)" />
+                <reference ref="oh_fee" />
             </optional>
         </item> <!-- Zip line -->
         <separator/>
@@ -2202,7 +2221,7 @@
             <link wiki="Tag:aerialway=station" />
             <space />
             <key key="aerialway" value="station" />
-            <text key="name" text="Name" />
+            <reference ref="name_ref_operator" />
         </item> <!-- Station -->
         <item name="Pylon" icon="presets/transport/aerialway/pylon.svg" type="node" preset_name_label="true">
             <link wiki="Tag:aerialway=pylon" />
@@ -2529,6 +2548,7 @@
             <reference ref="name_ref" />
             <optional>
                 <reference ref="public_transport_route_optionals" />
+                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
             </optional>
             <roles>
                 <role key="stop" text="stop position" requisite="optional" type="node" member_expression="public_transport=stop_position (bus=yes OR share_taxi=yes OR trolleybus=yes)" />
@@ -2551,6 +2571,7 @@
                 <text key="operator" text="Operator" />
                 <text key="network" text="Network" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
+                <text key="website" text="Website" />
             </optional>
             <roles>
                 <role key="" text="route variant/direction (at least 2)" requisite="required" type="relation" member_expression="type=route" /> <!-- fixme: at least 2 members are required -->
@@ -2591,17 +2612,23 @@
                 <combo key="tactile_paving" text="Tactile Paving" values="yes,no,incorrect" />
             </optional>
             <space />
-            <check key="bus" text="Bus" icon="presets/transport/bus.svg" />
-            <check key="tram" text="Tram" icon="presets/transport/railway/tram.svg" />
-            <check key="train" text="Train" icon="presets/transport/train.svg" />
-            <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
-            <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
-            <check key="subway" text="Subway" icon="presets/transport/railway/subway.svg" />
-            <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
-            <check key="monorail" text="Monorail" icon="presets/transport/railway/monorail.svg" />
-            <check key="funicular" text="Funicular" icon="presets/transport/railway/funicular.svg" />
-            <check key="aerialway" text="Aerialway" icon="presets/transport/aerialway/station.svg" />
-            <check key="ferry" text="Ferry" icon="presets/nautical/ferry.svg" />
+            <checkgroup columns="3">
+                <check key="bus"        text="Bus             " icon="presets/transport/bus.svg" />
+                <check key="trolleybus" text="Trolleybus" icon="presets/transport/trolleybus.svg" />
+                <check key="share_taxi" text="Share taxi" icon="presets/transport/share_taxi.svg" />
+            </checkgroup>
+            <checkgroup columns="4">
+                <check key="train"      text="Train           " icon="presets/transport/train.svg" />
+                <check key="light_rail" text="Light Rail" icon="presets/transport/railway/light_rail.svg" />
+                <check key="subway"     text="Subway" icon="presets/transport/railway/subway.svg" />
+                <check key="tram"       text="Tram" icon="presets/transport/railway/tram.svg" />
+            </checkgroup>
+            <checkgroup columns="2">
+                <check key="monorail"   text="Monorail    " icon="presets/transport/railway/monorail.svg" />
+                <check key="funicular"  text="Funicular" icon="presets/transport/railway/funicular.svg" />
+                <check key="aerialway"  text="Aerialway  " icon="presets/transport/aerialway/station.svg" />
+                <check key="ferry"      text="Ferry" icon="presets/nautical/ferry.svg" />
+            </checkgroup>
         </item> <!-- Stop Position -->
         <item name="Platform" type="node,way,closedway,multipolygon" icon="presets/transport/platform.svg" preset_name_label="true">
             <link wiki="Tag:public_transport=platform" />
@@ -2661,6 +2688,9 @@
                 <text key="network" text="Network" />
                 <text key="description" text="Description" />
                 <combo key="colour" text="Color (HTML name or hexadecimal code)" values_context="color" values="black,blue,brown,gray,green,orange,purple,red,silver,white,yellow,#CD853F" />
+                <reference ref="oh_fee" />
+                <combo key="reservation" text="Reservation" values="yes,no,required,recommended" />
+                <text key="website" text="Website" />
             </optional>
             <roles>
                 <role key="" text="route segment" requisite="optional" type="way,closedway" />