Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16851)
+++ trunk/resources/data/defaultpresets.xml	(revision 16852)
@@ -5817,7 +5817,9 @@
             <space />
             <key key="military" value="bunker" />
-            <combo key="bunker_type" text="Type" values="hardened_aircraft_shelter,munitions,pillbox" match="key" />
+            <combo key="bunker_type" text="Type" values="command,foxhole,gun_emplacement,hardened_aircraft_shelter,mg_nest,munitions,observation,personnel_shelter,pillbox,technical,tobruk" values_context="bunker" />
             <combo key="location" text="Location" values="overground,underground" values_context="bunker" />
-            <text key="name" text="Name" />
+            <combo key="building" text="Building" values="bunker,yes" values_context="building" />
+            <text key="name" text="Name" />
+            <reference ref="POI_access" />
             <check key="historic" text="Historic" />
             <check key="ruins" text="Ruins" />