Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10110)
+++ /trunk/data/defaultpresets.xml	(revision 10111)
@@ -2855,4 +2855,5 @@
             </optional>
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Fuel -->
         <item name="Charging Station" icon="styles/standard/vehicle/fuel/charging_station.png" type="node" preset_name_label="true">
@@ -3528,4 +3529,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Residential Building" />
         </item> <!-- Hotel -->
         <item name="Motel" icon="styles/standard/accommodation/motel.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3549,4 +3551,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Motel -->
         <item name="Guest House/Bed &amp; Breakfast" icon="styles/standard/accommodation/guest_house.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3569,4 +3572,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Guest House/Bed & Breakfast -->
         <item name="Chalet" icon="styles/standard/accommodation/chalet.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3590,4 +3594,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Chalet -->
         <item name="Hostel" icon="styles/standard/accommodation/hostel.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3611,4 +3616,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Hostel -->
         <item name="Alpine Hut" icon="styles/standard/accommodation/alpine_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3630,4 +3636,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Alpine Hut -->
         <item name="Wilderness Hut" icon="styles/standard/accommodation/wilderness_hut_blue.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -3650,4 +3657,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Wilderness Hut -->
         <separator/>
@@ -3741,4 +3749,5 @@
             <space />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Fast Food -->
         <item name="Food Court" icon="presets/restaurant.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4031,4 +4040,5 @@
             <text key="min_age" text="Minimum age" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Movie Theater/Cinema -->
         <item name="Zoo" icon="presets/zoo.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4291,4 +4301,5 @@
             <text key="wikipedia" text="Wikipedia" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Museum -->
         <item name="Theatre" icon="presets/theater.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4304,4 +4315,5 @@
             <reference ref="wheelchair" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Theatre -->
         <item name="Library" icon="styles/standard/shop/library.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4319,4 +4331,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Library -->
         <item name="Arts Centre" icon="presets/arts_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4330,4 +4343,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Arts Centre -->
         <item name="Artwork" icon="presets/arts_centre.png" type="node,way,closedway,multipolygon" preset_name_label="true">
@@ -4387,4 +4401,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Church -->
         <item name="Mosque" icon="styles/standard/religion/muslim.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4411,4 +4426,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Mosque -->
         <item name="Synagogue" icon="styles/standard/religion/jewish.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4435,4 +4451,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Synagogue -->
         <item name="Buddhist Temple" icon="styles/standard/religion/buddhism.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4458,4 +4475,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Buddhist Temple -->
         <item name="Hindu Temple" icon="styles/standard/religion/hinduism.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4481,4 +4499,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Hindu Temple -->
         <item name="Shinto Shrine" icon="styles/standard/religion/shinto.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4503,4 +4522,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Shinto Shrine -->
         <item name="Other Place of Worship" icon="styles/standard/religion.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4525,4 +4545,5 @@
             <reference ref="oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Other Place of Worship -->
     </group> <!-- Place of Worship -->
@@ -4540,4 +4561,5 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Town Hall -->
         <item name="Community Centre" icon="presets/community_centre.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4554,4 +4576,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Community Centre -->
         <item name="Embassy" icon="presets/embassy.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4579,4 +4602,5 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Courthouse -->
         <item name="Prison" icon="styles/standard/service/administration/prison.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4605,4 +4629,5 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Police -->
         <item name="Ranger Station" icon="styles/standard/service/ranger_station.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4626,4 +4651,5 @@
             <text key="name" text="Name" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Fire Station -->
         <item name="Post Office" icon="styles/standard/service/post_office.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4659,4 +4685,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Kindergarten -->
         <item name="School" icon="presets/school.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -4677,4 +4704,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- School -->
         <item name="University" icon="styles/standard/education/university.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5397,4 +5425,5 @@
             <reference ref="sport" />
             <reference ref="link_contact_address_payment" />
+            <preset_link preset_name="Building" />
         </item> <!-- Sports Centre -->
         <item name="Pitch" icon="styles/standard/sport/pitch.png" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5975,7 +6004,9 @@
             <space />
             <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,service,train_station,barn,stable,cabin,farm_auxiliary,transportation,greenhouse,office,university,hospital,kindergarten,manufacture,warehouse,retail,shed,storage_tank,supermarket,gasometer,silo,cowshed,construction,basilica,cathedral,chapel,church,temple,mosque,synagogue,transformer_tower,public" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
-            <text key="name" text="Name" />
-            <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
-            <text key="height" text="Height (meters)" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+                <text key="height" text="Height (meters)" />
+            </optional>
             <preset_link preset_name="Addresses" />
         </item> <!-- Building -->
@@ -5996,7 +6027,9 @@
             <space />
             <combo key="building" text="Building" values="yes,residential,apartments,house,hotel,hut,dormitory,terrace,detached,farm,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
-            <text key="name" text="Name" />
-            <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
-            <text key="height" text="Height (meters)" />
+            <optional>
+                <text key="name" text="Name" />
+                <combo key="building:levels" text="Levels" values="1,2,3,4,5,6,7,8,9,10,11" text_context="building" />
+                <text key="height" text="Height (meters)" />
+            </optional>
             <preset_link preset_name="Addresses" />
         </item> <!-- Residential Building -->
@@ -7523,4 +7556,5 @@
             <text key="ref" text="Reference" />
             <reference ref="link_contact_address" />
+            <preset_link preset_name="Building" />
         </item> <!-- Bank -->
         <item name="Money Exchange" icon="styles/standard/money/exchange.png" type="node,closedway,multipolygon" preset_name_label="true">