Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 15260)
+++ trunk/data/defaultpresets.xml	(revision 15262)
@@ -853,5 +853,5 @@
                 <check key="oneway" text="Oneway" />
                 <check key="toll" text="Toll" />
-                <check key="noexit" text="No exit (cul-de-sac)" />
+                <check key="noexit" text="No exit (cul-de-sac)" disable_off="true" />
             </checkgroup>
             <space />
@@ -2746,4 +2746,5 @@
             <text key="rooms" text="Rooms" />
             <text key="beds" text="Beds" />
+            <combo key="guest_house" text="Type" values="agritourism,bed_and_breakfast" />
             <reference ref="wheelchair" />
             <space />
@@ -3492,4 +3493,6 @@
             <key key="amenity" value="community_centre" />
             <reference ref="name_operator_oh_wheelchair" />
+            <combo key="community_centre" text="Type" values="club_home,community_hall,cultural_centre,environment_centre,events_venue,family_centre,language_centre,meeting_room,parish_hall,village_hall,youth_centre" />
+            <multiselect key="community_centre:for" text="For" values="child;juvenile;student;girl;boy;man;woman;senior;family;homosexual;multigeneration;disabled;athlete;immigrant;lgbtq" />
             <reference ref="link_contact_address" />
             <preset_link preset_name="Building" />