Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 7607)
+++ trunk/data/defaultpresets.xml	(revision 7613)
@@ -46,5 +46,5 @@
   key: key to set
   value: value to set
-  match: none/key/key!/keyvalue (default is "keyvalue", see below for more information)
+  match: none/key/key!/keyvalue/keyvalue! (default is "keyvalue!", see below for more information)
 
 text: text box
@@ -59,5 +59,5 @@
                   happens if the user selects it. default is no auto-increment;
                   mutually exclusive with use_last_as_default.
-  match: none/key/key!/keyvalue (default is "none", see below for more information)
+  match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
   length: length of input box (number of characters allowed)
   alternative_autocomplete_keys: comma separated list of alternative keys to use for autocompletion
@@ -83,5 +83,5 @@
   use_last_as_default: true/false/force (default is "false")
   editable: allow to add other values as text (default is "true")
-  match: none/key/key!/keyvalue (default is none, see below for more information)
+  match: none/key/key!/keyvalue/keyvalue! (default is none, see below for more information)
   values_searchable: true/false (whether to search in combo (display_)values when searching for presets)
   length: length of input box (number of characters allowed)
@@ -108,5 +108,5 @@
   default: default string to display (defaults to "")
   use_last_as_default: true/false/force (default is "false")
-  match: none/key/key!/keyvalue (default is "none", see below for more information)
+  match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
   values_searchable: true/false (whether to search in multiselect (display_)values when searching for presets)
 
@@ -121,5 +121,5 @@
   value_off: the value to set when unchecked (default is "no")
   disable_off: whether the off value is disabled in the dialog, i.e., only unset or yes are provided
-  match: none/key/key!/keyvalue (default is "none", see below for more information)
+  match: none/key/key!/keyvalue/keyvalue! (default is "none", see below for more information)
 
 role: type to specify possible roles in relations
@@ -162,5 +162,6 @@
  - key: positive if key matches, neutral otherwise
  - key!: positive if key matches, negative otherwise
- - keyvalue: positive if key and value matches, negative otherwise
+ - keyvalue: positive if key and value matches, neutral otherwise
+ - keyvalue!: positive if key and value matches, negative otherwise
 Note that for a match, at least one positive and no negative is required.
 -->
@@ -2731,5 +2732,5 @@
             <space />
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,light_rail,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
             <key key="public_transport:version" value="2" /> <!-- only validate marked relations in order to avoid false positives -->
             <reference ref="name_ref" />
@@ -2890,5 +2891,5 @@
         <item name="Public transport route (Legacy)" icon="presets/path.png" type="relation" preset_name_label="true">
             <key key="type" value="route" />
-            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue" />
+            <combo key="route" text="Route type" values="train,subway,monorail,tram,bus,trolleybus,aerialway,ferry" values_searchable="true" match="keyvalue!" />
             <key key="public_transport:version" value="1" /> <!-- only validate marked relations in order to avoid false positives -->
             <reference ref="name_ref" />
@@ -3960,5 +3961,5 @@
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue" values_searchable="true" />
+            <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
             <reference ref="service_times" />
             <reference ref="oh" />
@@ -5018,5 +5019,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
-            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue" values_searchable="true" />
+            <combo key="building" text="Building" values="yes,roof,garage,garages,industrial,school,hangar,commercial,farm,transportation,greenhouse,office,university,hospital,warehouse,retail,shed,cowshed,construction" values_context="building" default="yes" match="keyvalue!" values_searchable="true" />
             <text key="name" text="Name" />
         </item> <!-- Building -->
@@ -5036,5 +5037,5 @@
                   uk.href="http://wiki.openstreetmap.org/wiki/Uk:Key:building" />
             <space />
-            <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue" values_context="building" values_searchable="true" />
+            <combo key="building" text="Building" values="residential,apartments,house,hut,dormitory,terrace,detached,roof" default="residential" match="keyvalue!" values_context="building" values_searchable="true" />
             <text key="name" text="Name" />
         </item> <!-- Residential Building -->
@@ -5358,5 +5359,5 @@
                   zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Key:bridge" />
             <space />
-            <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue" default="yes" />
+            <combo key="bridge" text="Bridge" values="yes,aqueduct,boardwalk,cantilever,covered,low_water_crossing,trestle,viaduct" match="keyvalue!" default="yes" />
             <combo key="bridge:structure" text="Structure" values="arch,beam,truss,floating,suspension,cable-stayed,simple-suspension,humpback" match="key" />
             <reference ref="optional_bridge" />
@@ -5729,5 +5730,5 @@
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:power=line" />
             <space />
-            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue" />
+            <combo key="power" text="Line type" values="line,minor_line" default="line" match="keyvalue!" />
             <reference ref="voltage_frequency" />
             <reference ref="ref_operator_branch" />
@@ -7731,5 +7732,5 @@
                 <key key="type" value="route"/>
                 <key key="route" value="bicycle"/>
-                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue" />
+                <combo key="network" text="Network" values="icn,ncn,rcn,lcn" match="keyvalue!" />
                 <reference ref="name_ref_operator"/>
                 <optional>
@@ -7771,5 +7772,5 @@
                 <key key="type" value="route"/>
                 <key key="route" value="hiking"/>
-                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue" />
+                <combo key="network" text="Network" values="iwn,nwn,rwn,lwn" match="keyvalue!" />
                 <reference ref="name_ref_operator"/>
                 <optional>
@@ -7788,5 +7789,5 @@
                 <key key="type" value="route"/>
                 <key key="route" value="piste"/>
-                <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue" />
+                <combo key="piste:type" text="Piste type" values="downhill,nordic,skitour,snow_park" match="keyvalue!" />
                 <reference ref="name_ref_operator"/>
                 <optional>
@@ -7809,5 +7810,5 @@
                 <key key="type" value="route"/>
                 <key key="route" value="piste"/>
-                <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue" />
+                <combo key="piste:type" text="Piste type" values="nordic,alpine" match="keyvalue!" />
                 <reference ref="name_ref_operator"/>
                 <optional>