Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15165)
+++ trunk/data/defaultpresets.xml	(revision 15166)
@@ -165,5 +165,5 @@
     </chunk>
     <chunk id="cuisine">
-    <multiselect key="cuisine" text="Cuisine" values="italian;chinese;pizza;burger;greek;german;indian;regional;kebab;turkish;asian;thai;mexican;japanese;french;sandwich;coffee_shop;sushi;steak_house;fish_and_chips;chicken;american;ice_cream;international;seafood;spanish;vietnamese;fish;noodle;barbecue;vegetarian;korean;donut;mediterranean;friture;crepe" values_searchable="true" />
+    <multiselect key="cuisine" text="Cuisine" values="african;american;arab;argentinian;asian;bagel;balkan;barbecue;bavarian;brazilian;burger;cake;caribbean;chicken;chinese;coffee_shop;crepe;curry;danish;donut;ethiopian;fish;fish_and_chips;french;friture;german;greek;ice_cream;indian;indonesian;international;italian;japanese;kebab;korean;lebanese;mediterranean;mexican;moroccan;noodle;pancake;pasta;peruvian;pizza;polish;portuguese;regional;russian;sandwich;sausage;seafood;spanish;steak_house;sushi;tapas;thai;turkish;vietnamese" values_searchable="true" />
     </chunk>
     <chunk id="internet">
@@ -1684,5 +1684,5 @@
             <key key="natural" value="wetland" />
             <text key="name" text="Name" />
-            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove,wet_meadow,string_bog,saltern" values_searchable="true" />
+            <combo key="wetland" text="Type" values="swamp,bog,marsh,reedbed,saltmarsh,tidalflat,mangrove,wet_meadow,string_bog,saltern,fen" values_searchable="true" />
             <check key="seasonal" text="Seasonal" disable_off="true" />
         </item> <!-- Wetland -->
@@ -2208,5 +2208,5 @@
             <reference ref="car_brands" />
             <reference ref="name_operator_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="only,yes,no" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Car Dealer -->
@@ -2282,5 +2282,5 @@
             <text key="operator" text="Operator" />
             <reference ref="oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="only,yes,no" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" />
             <optional text="Services:">
                 <combo key="sale" text="Sale" values="yes,brand,no" />
@@ -2764,4 +2764,5 @@
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
+            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
             <space />
             <reference ref="internet_smoking" />
@@ -2840,4 +2841,5 @@
             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
+            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
             <reference ref="oh_wheelchair" />
             <combo key="stars" text="Stars" values="1,2,3,4,5,6,7" />
@@ -2845,4 +2847,5 @@
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Restaurant -->
@@ -2856,8 +2859,11 @@
             <combo key="takeaway" text="Takeaway" values="yes,no,only" />
             <combo key="delivery" text="Delivery" values="yes,no,only,Mo-Su 12:00-22:00" />
-            <reference ref="oh_wheelchair" />
-            <space />
+            <reference ref="oh" />
+            <combo key="opening_hours:kitchen " text="Kitchen Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
+            <space />
+            <reference ref="wheelchair" />
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
             <preset_link preset_name="Building" />
@@ -2888,4 +2894,5 @@
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Cafe -->
@@ -2902,4 +2909,5 @@
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Ice cream -->
@@ -2917,4 +2925,5 @@
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Pub -->
@@ -2929,4 +2938,5 @@
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Beer Garden -->
@@ -2941,6 +2951,26 @@
             <reference ref="internet_smoking" />
             <space />
+            <preset_link preset_name="Diet" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Bar -->
+        <separator/>
+        <item name="Diet" icon="presets/food/diet.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Key:diet" />
+            <space />
+            <combo key="diet:vegetarian" text="Vegetarian" values="yes,no,only" />
+            <combo key="diet:vegan" text="Vegan" values="yes,no,only" />
+            <combo key="diet:lacto_vegetarian" text="Lacto-vegetarian" values="yes,no,only" />
+            <combo key="diet:ovo_vegetarian" text="Ovo-vegetarian" values="yes,no,only" />
+            <combo key="diet:pescetarian" text="Pescetarian" values="yes,no,only" />
+            <combo key="diet:fruitarian" text="Fruitarian" values="yes,no,only" />
+            <combo key="diet:raw" text="Raw" values="yes,no,only" />
+            <space />
+            <combo key="diet:dairy_free" text="Dairy free" values="yes,no,only" />
+            <combo key="diet:gluten_free" text="Gluten free" values="yes,no,only" />
+            <combo key="diet:lactose_free" text="Lactose free" values="yes,no,only" />
+            <space />
+            <combo key="diet:halal" text="Halal" values="yes,no,only" />
+            <combo key="diet:kosher" text="Kosher" values="yes,no,only" />
+        </item> <!-- Diet -->
     </group> <!-- Food+Drinks -->
     <group name="Tourism" icon="presets/sightseeing/attraction.svg">
@@ -2949,5 +2979,7 @@
             <space />
             <key key="tourism" value="attraction" />
-            <reference ref="name_oh_wheelchair" />
+            <text key="name" text="Name" />
+            <combo key="reservation" text="Reservation" values="yes,no,required,recommended,members_only" />
+            <reference ref="oh_wheelchair" />
         </item> <!-- Attraction -->
         <item name="Viewpoint" icon="presets/sightseeing/viewpoint.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5567,5 +5599,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <text key="website" text="Website" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <combo key="organic" text="Organic" values="yes,no,only" />
         </item> <!-- Public Market -->
         <item name="Greengrocer" icon="presets/shop/groceries/greengrocer.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5574,5 +5606,5 @@
             <key key="shop" value="greengrocer" />
             <reference ref="name_oh_wheelchair" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <combo key="organic" text="Organic" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Greengrocer -->
@@ -5583,5 +5615,5 @@
             <reference ref="name_oh_wheelchair" />
             <text key="description" text="Description" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <combo key="organic" text="Organic" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Farm Stand -->
@@ -5590,5 +5622,5 @@
             <link wiki="Key:organic" />
             <space />
-            <combo text="Organic/Bio" key="organic" values="only,yes,no" match="key" />
+            <combo text="Organic/Bio" key="organic" values="yes,no,only" match="key" />
         </item> <!-- Organic -->
         <item name="Fair Trade" type="node,closedway,multipolygon" preset_name_label="true">
@@ -5626,6 +5658,6 @@
             <key key="shop" value="clothes" />
             <reference ref="name_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="organic" text="Organic" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Clothes -->
@@ -5642,6 +5674,6 @@
             <key key="shop" value="shoes" />
             <reference ref="name_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="only,yes,no" />
-            <combo key="organic" text="Organic" values="only,yes,no" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" />
+            <combo key="organic" text="Organic" values="yes,no,only" />
             <check key="shoes:repair" text="Offers repairs" text_context="shoes" />
             <reference ref="link_contact_address_payment" />
@@ -5884,5 +5916,5 @@
             <key key="shop" value="books" />
             <reference ref="name_brand_oh_wheelchair" />
-            <combo key="second_hand" text="Second hand" values="only,yes,no" />
+            <combo key="second_hand" text="Second hand" values="yes,no,only" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Book Store -->