Index: /trunk/presets/presets.xml
===================================================================
--- /trunk/presets/presets.xml	(revision 464)
+++ /trunk/presets/presets.xml	(revision 465)
@@ -13,5 +13,5 @@
 	<item name="Road" icon="presets/ways.png">
     <label text="Roads" />
-		<combo key="highway" text="Type:" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,tertiary,residential,unclassified,service,byway,unsurfaced,bridleway,track,cycleway,pedestrian,footway,steps" delete_if_empty="true" />
+		<combo key="highway" text="Type:" values="motorway,motorway_link,trunk,trunk_link,primary,primary_link,secondary,minor,residential,unclassified,service,byway,unsurfaced,bridleway,track,cycleway,pedestrian,footway,steps" delete_if_empty="true" />
 		<text key="name" text="Name:" default="" delete_if_empty="true" />
   </item>
@@ -19,5 +19,5 @@
 	<item name="Road Point" icon="presets/waypoints.png">
 		<label text="Road Points" />
-		<combo key="highway" text="Type:" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,bridge,viaduct,stop,gate,bollard,bus_station,bus_halt,bus_stop,stile,cattle_grid,ford" default="" />
+		<combo key="highway" text="Type:" values="motorway_junction,services,toll_booth,traffic_signals,crossing,mini_roundabout,incline,incline_steep,bridge,viaduct,stop,gate,bus_station,bus_halt,bus_stop,stile,cattle_grid,ford" default="" />
 		<text key="name" text="Name:" default="" delete_if_empty="true" />
   </item>
@@ -194,5 +194,5 @@
  <item name="Leisure" icon="presets/leisure.png">
 	 <label text="Leisure" />
-	 <combo key="leisure" text="Type:" values="stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,garden,slipway,playground,common,park_bench" default="" delete_if_empty="true" />
+	 <combo key="leisure" text="Type:" values="stadium,marina,track,pitch,water_park,fishing,nature_reserve,park,garden,slipway,playground,common" default="" delete_if_empty="true" />
 	 <text key="name" text="Name:" default="" delete_if_empty="true" />
  </item>
@@ -246,10 +246,4 @@
 	 <key key="amenity" value="recycling" />
  </item>
- 
-<!--
- <item name="Police" icon="presets/police.png">
-	 <key key="amenity" value="police" />
- </item>
--->
 
  <item name="Parking" icon="presets/parking.png">
@@ -273,4 +267,6 @@
 	 <key key="amenity" value="place_of_worship" />
 	 <text key="name" text="Name:" default="" delete_if_empty="true" />
+	 <combo key="religion" text="Religion:" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarianist,zoroastrian" default="" delete_if_empty="true" />
+	 <combo key="denomination" text="Denomination:" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,quaker,shia,sunni" default="" delete_if_empty="true" />
  </item>