Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 17038)
+++ trunk/resources/data/defaultpresets.xml	(revision 17044)
@@ -3061,4 +3061,7 @@
             <optional>
                 <text key="ref" text="Reference" />
+                <text key="length" text="Length (meters)" />
+                <combo key="width" text="Width (meters)" values="18,23,30,45,60" />
+                <text key="ele" text="Elevation (meters)" length="10" />
                 <reference ref="surface" />
             </optional>
@@ -3069,4 +3072,6 @@
             <optional>
                 <text key="ref" text="Reference" />
+                <text key="width" text="Width (meters)" />
+                <reference ref="surface" />
             </optional>
         </item> <!-- Taxiway -->
@@ -3082,7 +3087,9 @@
             <key key="aeroway" value="helipad" />
             <optional>
-                <text key="ref" text="Reference" />
+                <reference ref="name_ref" />
                 <text key="iata" text="IATA" />
                 <text key="icao" text="ICAO" />
+                <text key="ele" text="Elevation (meters)" length="10" />
+                <reference ref="surface"/>
                 <reference ref="wikipedia_wikidata" />
             </optional>
@@ -3091,4 +3098,8 @@
             <link wiki="Tag:aeroway=apron" />
             <key key="aeroway" value="apron" />
+            <optional>
+                <reference ref="name_ref" />
+                <reference ref="surface"/>
+            </optional>
         </item> <!-- Apron -->
         <item name="Plane Parking Position" icon="presets/transport/airport/parking_position.svg" type="node,way" preset_name_label="true">
@@ -4349,5 +4360,5 @@
             <reference ref="name_ref_operator" />
             <space />
-            <text key="water_tank:volume" text="Volume (in liters)" />
+            <text key="water_tank:volume" text="Volume (liters)" />
         </item> <!-- Water Tank -->
         <item name="Suction point" icon="presets/emergency/suction_point.svg" type="node" preset_name_label="true">
@@ -4378,5 +4389,5 @@
             <combo key="siren:type" text="Type" values="pneumatic,electronic,mechanical" />
             <multiselect key="siren:purpose" text="Purpose" values="tornado;fire;air_raid;civil_defense" rows="5" values_searchable="true" />
-            <text key="siren:range" text="Range (in meters)" />
+            <text key="siren:range" text="Range (meters)" />
         </item> <!-- Siren -->
     </group> <!-- Emergency -->
@@ -4405,5 +4416,5 @@
             <key key="social_facility" value="group_home" />
             <reference ref="name_operator" />
-            <combo key="social_facility:for" text="For" value="senior" default="senior" />
+            <combo key="social_facility:for" text="For" values="senior" default="senior" />
             <text key="capacity" text="Capacity" />
             <reference ref="link_contact_address" />
@@ -4415,5 +4426,5 @@
             <key key="social_facility" value="assisted_living" />
             <reference ref="name_operator" />
-            <combo key="social_facility:for" text="For" value="senior" default="senior" />
+            <combo key="social_facility:for" text="For" values="senior" default="senior" />
             <text key="capacity" text="Capacity" />
             <reference ref="link_contact_address" />
@@ -5466,5 +5477,5 @@
             <text key="name" text="Name" />
             <combo key="mineshaft_type" text="Function" values="winding,air" />
-            <text key="depth" text="Depth in meters" />
+            <text key="depth" text="Depth (meters)" />
             <text key="operator" text="Operator" />
             <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />
@@ -5477,5 +5488,5 @@
             <key key="man_made" value="adit" />
             <text key="name" text="Name" />
-            <text key="length" text="Length in meters" />
+            <text key="length" text="Length (meters)" />
             <text key="operator" text="Operator" />
             <combo key="resource" text="Resource" values="aggregate,bauxite,clay,coal,copper,dimension_stone,gold,ilmenite,iron_ore,lead,limestone,nickel,rutile,salt,silver,tin,zinc,zircon" />