Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16762)
+++ trunk/resources/data/defaultpresets.xml	(revision 16763)
@@ -7120,5 +7120,5 @@
         <space />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
+        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 16762)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 16763)
@@ -24,5 +24,4 @@
 S:au.gov.abs:
 S:qroti:
-S:is_in
 S:wikipedia
 S:source:
@@ -407,5 +406,5 @@
 K:power=sub_station
 K:location=rooftop
-K:generator:location
+E:generator:location
 K:generator:method=dam
 K:generator:method=pumped-storage
@@ -418,5 +417,5 @@
 K:measurement=weather
 K:measurement=seismic
-K:monitoring:river_level
+E:monitoring:river_level
 E:stay
 K:emergency=aed
@@ -449,5 +448,4 @@
 K:manhole=unknown
 K:manhole=yes
-K:police=yes
 K:traffic_calming=yes
 K:access=restricted
@@ -599,10 +597,10 @@
 K:amenity=fire_hydrant
 K:fire_hydrant:type=pond
-K:fire_hydrant:flow_capacity
-K:fire_hydrant:water_source
+E:fire_hydrant:flow_capacity
+E:fire_hydrant:water_source
 K:natural=waterfall
 K:religion=unitarian
 K:hop=shopping_centre
-K:is_in
+E:is_in
 S:is_in:
 K:sport=football
@@ -618,5 +616,5 @@
 K:amenity=winery
 K:amenity=youth_centre
-K:building:type
+E:building:type
 E:escalator
 E:fenced
@@ -650,5 +648,5 @@
 K:access=public
 K:crossing=island
-K:recycling:metal
+E:recycling:metal
 K:shop=dog_grooming
 K:tower:type=anchor