Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 18811)
+++ /trunk/resources/data/defaultpresets.xml	(revision 18812)
@@ -7595,4 +7595,8 @@
             <text key="operator" text="Operator" />
             <reference ref="oh_wheelchair" />
+            <optional text="Deposits:">
+                <combo key="cash_in" text="Cash deposits" values="yes,no,customers" />
+                <check key="cash_in:coins" text="Coin deposits" />
+            </optional>
         </item> <!-- Automated Teller Machine -->
         <item name="Pawnbroker" icon="presets/shop/pawnbroker.svg" type="node,closedway,multipolygon" preset_name_label="true">
Index: /trunk/resources/data/tagging-preset.xsd
===================================================================
--- /trunk/resources/data/tagging-preset.xsd	(revision 18811)
+++ /trunk/resources/data/tagging-preset.xsd	(revision 18812)
@@ -408,5 +408,5 @@
             <annotation>
                 <documentation>
-                    The combo box is read only, which means that the user can only select an item in the list. Default is "true", which means, the user can add other values as text. Feature is broken, see #6157.
+                    The combo box is read only, which means that the user can only select an item in the list. Default is "true", which means, the user can add other values as text.
                 </documentation>
             </annotation>
Index: /trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- /trunk/resources/data/validator/ignoretags.cfg	(revision 18811)
+++ /trunk/resources/data/validator/ignoretags.cfg	(revision 18812)
@@ -165,4 +165,6 @@
 E:cai_scale
 E:railway:radio
+E:genus:de
+E:heritage:operator
 ;
 ; Ignore valid and semi-valid keys that end with...
@@ -788,4 +790,6 @@
 K:military=trench
 K:natural=crevasse
+; orchard=meadow_orchard seems to be more of a boolean value, "also happens to be a meadow". Don't know how we want to handle it.
+K:orchard=meadow_orchard
 ; Streetside parking tags (see #22901 22901.patch for starting icons)
 ; There is an external preset for these tags