Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18556)
+++ trunk/resources/data/defaultpresets.xml	(revision 18557)
@@ -8006,5 +8006,5 @@
         </checkgroup>
         <space />
-        <combo key="payment:debit_cards" text="Debit cards" values="no" match="keyvalue" />
+        <combo key="payment:debit_cards" text="Debit cards" values="yes,no" match="keyvalue" />
         <checkgroup columns="4">
             <check key="payment:bankaxess" text="BankAxess" match="keyvalue" />
@@ -8018,5 +8018,5 @@
         </checkgroup>
         <space />
-        <combo key="payment:credit_cards" text="Credit cards" values="no" match="keyvalue" />
+        <combo key="payment:credit_cards" text="Credit cards" values="yes,no" match="keyvalue" />
         <checkgroup columns="4">
             <check key="payment:american_express" text="American Express" match="keyvalue" />
@@ -8030,5 +8030,5 @@
         <check key="payment:contactless" text="Contactless payment" match="keyvalue" />
         <space />
-        <combo key="payment:electronic_purses" text="Electronic purses and Charge cards" values="no" match="keyvalue" />
+        <combo key="payment:electronic_purses" text="Electronic purses and Charge cards" values="yes,no" match="keyvalue" />
         <checkgroup columns="4">
             <check key="payment:ep_avant" text="Avant (fi)" match="keyvalue" />
@@ -8040,5 +8040,5 @@
         </checkgroup>
         <space />
-        <combo key="payment:cryptocurrencies" text="Cryptocurrencies" values="no" match="keyvalue" />
+        <combo key="payment:cryptocurrencies" text="Cryptocurrencies" values="yes,no" match="keyvalue" />
         <checkgroup columns="4">
             <check key="payment:bitcoin" text="Bitcoin" match="keyvalue" />
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 18556)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 18557)
@@ -704,16 +704,10 @@
 }
 
-/* #11499, #16928 */
-*[payment:credit_cards=yes] {
-  throwOther: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:mastercard=yes", "payment:visa=yes");
-}
-*[payment:debit_cards=yes] {
-  throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:maestro=yes", "payment:girocard=yes");
-}
+/* #11499, #16928, #22367 */
 *[payment:electronic_purses=yes] {
-  throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:ep_geldkarte=yes", "payment:ep_quick=yes");
+  throwOther: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:ep_geldkarte=yes", "payment:ep_quick=yes");
 }
 *[payment:cryptocurrencies=yes] {
-  throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:bitcoin=yes", "payment:litecoin=yes");
+  throwOther: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:bitcoin=yes", "payment:litecoin=yes");
 }
 
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18556)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18557)
@@ -513,8 +513,4 @@
 K:sport=billards
 K:sport=billiard
-K:payment:credit_cards=yes
-K:payment:debit_cards=yes
-K:payment:electronic_purses=yes
-K:payment:cryptocurrencies=yes
 E:payment:ep_quick
 E:payment:ep_cash