Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9060)
+++ trunk/data/defaultpresets.xml	(revision 9080)
@@ -361,4 +361,10 @@
         </optional>
     </chunk>
+    <chunk id="car_brands">
+    <multiselect key="brand" text="Car brand" values="Alfa Romeo;Aston Martin;Audi;Bentley;BMW;Buick;Cadillac;Chevrolet;Chrysler;Citroën;Dacia;Daewoo;Daihatsu;Dodge;Ferrari;Fiat;Ford;GMC;Great Wall;Holden;Honda;Hyundai;Infiniti;Isuzu;Jaguar;Jeep;Kia;Lada;Lancia;Land Rover;Lexus;Lincoln;Lotus;Maserati;Mazda;Mercedes-Benz;Mini;Mitsubishi;Nissan;Opel;Peugeot;Renault;Saab;Seat;Škoda;Smart;SsangYong;Subaru;Suzuki;Toyota;Vauxhall;Volkswagen;Volvo" />
+  </chunk>
+  <chunk id="motorcycle_brands">
+    <multiselect key="brand" text="Motorcycle brand" values="Aprillia;BMW;Ducati;Gilera;Harley-Davidson;Honda;Kawasaki;KTM;Kymco;Piaggio;Peugeot;Piaggio;Suzuki;Triumph;Vespa;Yamaha" />
+  </chunk>
   <!-- Link chunks -->
   <chunk id="link_contact_address">
@@ -2741,5 +2747,6 @@
             <space />
             <key key="shop" value="car" />
-            <reference ref="name_brand_operator_oh_wheelchair" />
+            <reference ref="car_brands" />
+            <reference ref="name_operator_oh_wheelchair" />
             <combo key="second_hand" text="Second hand" values="only,yes,no" />
             <reference ref="link_contact_address_payment" />
@@ -2754,5 +2761,6 @@
             <space />
             <key key="shop" value="car_repair" />
-            <reference ref="name_brand_operator_oh_wheelchair" />
+            <reference ref="car_brands" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Repair -->
@@ -2763,5 +2771,6 @@
             <space />
             <key key="shop" value="car_parts" />
-            <reference ref="name_brand_operator_oh_wheelchair" />
+            <reference ref="car_brands" />
+            <reference ref="name_operator_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Parts -->
@@ -2831,5 +2840,5 @@
             <key key="shop" value="motorcycle" />
             <text key="name" text="Name" />
-            <combo key="brand" text="Brand" values="independent" />
+            <reference ref="motorcycle_brands" />
             <text key="operator" text="Operator" />
             <reference ref="oh_wheelchair" />
@@ -5523,4 +5532,5 @@
             <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)" />
+            <preset_link preset_name="Addresses" />
         </item> <!-- Building -->
         <item name="Residential Building" icon="styles/standard/misc/landmark/building.png" type="node,closedway,relation" preset_name_label="true">
@@ -5543,4 +5553,5 @@
             <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)" />
+            <preset_link preset_name="Addresses" />
         </item> <!-- Residential Building -->
             <item name="Building part" icon="styles/standard/misc/landmark/building.png" type="closedway,relation" preset_name_label="true">