diff --git a/data/presets.yaml b/data/presets.yaml
index 9d0b0c6a4..0af50c8a3 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3474,21 +3474,21 @@ en:
         name: Curb
         terms: '<translate with synonyms or related terms for ''Curb'', separated by commas>'
       barrier/kerb/flush:
-        # 'barrier=kerb, kerb=flush'
+        # kerb=flush
         name: Flush Curb
         # 'terms: even curb,level curb,tactile curb'
         terms: '<translate with synonyms or related terms for ''Flush Curb'', separated by commas>'
       barrier/kerb/lowered:
-        # 'barrier=kerb, kerb=lowered'
+        # kerb=lowered
         name: Lowered Curb
         # 'terms: curb cut,curb ramp,kerb ramp,dropped kerb,pram ramp'
         terms: '<translate with synonyms or related terms for ''Lowered Curb'', separated by commas>'
       barrier/kerb/raised:
-        # 'barrier=kerb, kerb=raised'
+        # kerb=raised
         name: Raised Curb
         terms: '<translate with synonyms or related terms for ''Raised Curb'', separated by commas>'
       barrier/kerb/rolled:
-        # 'barrier=kerb, kerb=rolled'
+        # kerb=rolled
         name: Rolled Curb
         # 'terms: gutter'
         terms: '<translate with synonyms or related terms for ''Rolled Curb'', separated by commas>'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2f61c2652..06397e268 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -273,11 +273,11 @@
     "barrier/guard_rail": {"icon": "temaki-guard_rail", "fields": ["material"], "geometry": ["line"], "tags": {"barrier": "guard_rail"}, "name": "Guard Rail", "terms": ["guardrail", "traffic barrier", "crash barrier", "median barrier", "roadside barrier", "Armco barrier"], "matchScore": 0.75},
     "barrier/hedge": {"fields": ["height"], "geometry": ["line", "area"], "tags": {"barrier": "hedge"}, "name": "Hedge", "matchScore": 0.25},
     "barrier/height_restrictor": {"icon": "temaki-car_wash", "fields": ["maxheight"], "geometry": ["vertex"], "tags": {"barrier": "height_restrictor"}, "name": "Height Restrictor"},
-    "barrier/kerb": {"icon": "temaki-kerb-raised", "fields": ["kerb", "tactile_paving"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "name": "Curb"},
-    "barrier/kerb/flush": {"icon": "temaki-kerb-flush", "fields": ["kerb", "{barrier/kerb}"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"},
-    "barrier/kerb/lowered": {"icon": "temaki-kerb-lowered", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
-    "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"},
-    "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"},
+    "barrier/kerb": {"icon": "temaki-kerb-raised", "fields": ["kerb", "tactile_paving", "wheelchair"], "moreFields": ["material"], "geometry": ["vertex", "line"], "tags": {"barrier": "kerb"}, "matchScore": 0.95, "name": "Curb"},
+    "barrier/kerb/flush": {"icon": "temaki-kerb-flush", "fields": ["kerb", "{barrier/kerb}"], "geometry": ["vertex", "line"], "tags": {"kerb": "flush"}, "addTags": {"barrier": "kerb", "kerb": "flush"}, "reference": {"key": "kerb", "value": "flush"}, "terms": ["even curb", "level curb", "tactile curb"], "name": "Flush Curb"},
+    "barrier/kerb/lowered": {"icon": "temaki-kerb-lowered", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "lowered"}, "addTags": {"barrier": "kerb", "kerb": "lowered"}, "reference": {"key": "kerb", "value": "lowered"}, "terms": ["curb cut", "curb ramp", "kerb ramp", "dropped kerb", "pram ramp"], "name": "Lowered Curb"},
+    "barrier/kerb/raised": {"icon": "temaki-kerb-raised", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "raised"}, "addTags": {"barrier": "kerb", "kerb": "raised"}, "reference": {"key": "kerb", "value": "raised"}, "terms": [], "name": "Raised Curb"},
+    "barrier/kerb/rolled": {"icon": "temaki-kerb-rolled", "fields": ["kerb", "{barrier/kerb}", "kerb/height"], "geometry": ["vertex", "line"], "tags": {"kerb": "rolled"}, "addTags": {"barrier": "kerb", "kerb": "rolled"}, "reference": {"key": "kerb", "value": "rolled"}, "terms": ["gutter"], "name": "Rolled Curb"},
     "barrier/kissing_gate": {"icon": "maki-barrier", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "kissing_gate"}, "name": "Kissing Gate"},
     "barrier/lift_gate": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex", "line"], "tags": {"barrier": "lift_gate"}, "name": "Lift Gate"},
     "barrier/retaining_wall": {"icon": "temaki-wall", "fields": ["height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "retaining_wall"}, "name": "Retaining Wall"},
diff --git a/data/presets/presets/barrier/kerb.json b/data/presets/presets/barrier/kerb.json
index 78cbeb99f..eac67c8f7 100644
--- a/data/presets/presets/barrier/kerb.json
+++ b/data/presets/presets/barrier/kerb.json
@@ -2,7 +2,8 @@
     "icon": "temaki-kerb-raised",
     "fields": [
         "kerb",
-        "tactile_paving"
+        "tactile_paving",
+        "wheelchair"
     ],
     "moreFields": [
         "material"
@@ -14,5 +15,6 @@
     "tags": {
         "barrier": "kerb"
     },
+    "matchScore": 0.95,
     "name": "Curb"
 }
diff --git a/data/presets/presets/barrier/kerb/flush.json b/data/presets/presets/barrier/kerb/flush.json
index 635297bd5..67dedebc1 100644
--- a/data/presets/presets/barrier/kerb/flush.json
+++ b/data/presets/presets/barrier/kerb/flush.json
@@ -9,6 +9,9 @@
         "line"
     ],
     "tags": {
+        "kerb": "flush"
+    },
+    "addTags": {
         "barrier": "kerb",
         "kerb": "flush"
     },
diff --git a/data/presets/presets/barrier/kerb/lowered.json b/data/presets/presets/barrier/kerb/lowered.json
index 69b820f57..5e4f37859 100644
--- a/data/presets/presets/barrier/kerb/lowered.json
+++ b/data/presets/presets/barrier/kerb/lowered.json
@@ -10,6 +10,9 @@
         "line"
     ],
     "tags": {
+        "kerb": "lowered"
+    },
+    "addTags": {
         "barrier": "kerb",
         "kerb": "lowered"
     },
diff --git a/data/presets/presets/barrier/kerb/raised.json b/data/presets/presets/barrier/kerb/raised.json
index 37cea3975..204fe5d7a 100644
--- a/data/presets/presets/barrier/kerb/raised.json
+++ b/data/presets/presets/barrier/kerb/raised.json
@@ -10,6 +10,9 @@
         "line"
     ],
     "tags": {
+        "kerb": "raised"
+    },
+    "addTags": {
         "barrier": "kerb",
         "kerb": "raised"
     },
diff --git a/data/presets/presets/barrier/kerb/rolled.json b/data/presets/presets/barrier/kerb/rolled.json
index 87ae9cd60..f4f92c530 100644
--- a/data/presets/presets/barrier/kerb/rolled.json
+++ b/data/presets/presets/barrier/kerb/rolled.json
@@ -10,6 +10,9 @@
         "line"
     ],
     "tags": {
+        "kerb": "rolled"
+    },
+    "addTags": {
         "barrier": "kerb",
         "kerb": "rolled"
     },