diff --git a/data/presets/presets.json b/data/presets/presets.json
index 8bba4c5de..429d480af 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -12,7 +12,7 @@
     "indoor": {"fields": ["level", "indoor_type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"indoor": "*"}, "matchScore": 0.8, "searchable": false, "name": "Indoor Feature"},
     "landuse": {"fields": ["name", "landuse"], "geometry": ["area"], "tags": {"landuse": "*"}, "matchScore": 0.9, "searchable": false, "name": "Land Use"},
     "leisure": {"icon": "maki-pitch", "fields": ["name", "leisure"], "geometry": ["point", "vertex", "line", "area"], "tags": {"leisure": "*"}, "searchable": false, "name": "Leisure"},
-    "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "searchable": false, "name": "Man Made"},
+    "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"},
     "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"},
     "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"},
     "playground": {"icon": "maki-playground", "fields": ["playground"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"},
@@ -723,9 +723,9 @@
     "man_made/watermill": {"icon": "maki-watermill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["water", "wheel", "mill"], "tags": {"man_made": "watermill"}, "name": "Watermill"},
     "man_made/windmill": {"icon": "maki-windmill", "fields": ["building_area"], "geometry": ["point", "area"], "terms": ["wind", "wheel", "mill"], "tags": {"man_made": "windmill"}, "name": "Windmill"},
     "man_made/works": {"icon": "maki-industry", "fields": ["name", "operator", "address", "building_area", "product"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "terms": ["assembly", "build", "brewery", "car", "plant", "plastic", "processing", "manufacture", "refinery"], "tags": {"man_made": "works"}, "name": "Factory"},
-    "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
-    "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
-    "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"},
+    "manhole": {"icon": "maki-circle-stroked", "fields": ["manhole", "operator", "label", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "*"}, "addTags": {"man_made": "manhole", "manhole": "*"}, "terms": ["cover", "hole", "sewer", "sewage", "telecom"], "name": "Manhole"},
+    "manhole/drain": {"icon": "maki-water", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "drain"}, "addTags": {"man_made": "manhole", "manhole": "drain"}, "terms": ["cover", "drain", "hole", "rain", "sewer", "sewage", "storm"], "name": "Storm Drain"},
+    "manhole/telecom": {"icon": "maki-circle-stroked", "fields": ["operator", "ref"], "geometry": ["point", "vertex"], "tags": {"manhole": "telecom"}, "addTags": {"man_made": "manhole", "manhole": "telecom"}, "terms": ["cover", "phone", "hole", "telecom", "telephone", "bt"], "name": "Telecom Manhole"},
     "natural/bare_rock": {"geometry": ["area"], "tags": {"natural": "bare_rock"}, "terms": ["rock"], "name": "Bare Rock"},
     "natural/bay": {"icon": "temaki-beach", "geometry": ["point", "area"], "fields": ["name"], "tags": {"natural": "bay"}, "terms": [], "name": "Bay"},
     "natural/beach": {"icon": "temaki-beach", "fields": ["surface"], "geometry": ["point", "area"], "tags": {"natural": "beach"}, "terms": ["shore"], "name": "Beach"},
diff --git a/data/presets/presets/_man_made.json b/data/presets/presets/_man_made.json
index e9a44d692..887cd5997 100644
--- a/data/presets/presets/_man_made.json
+++ b/data/presets/presets/_man_made.json
@@ -16,6 +16,7 @@
     "tags": {
         "man_made": "*"
     },
+    "matchScore": 0.95,
     "searchable": false,
     "name": "Man Made"
 }
diff --git a/data/presets/presets/manhole.json b/data/presets/presets/manhole.json
index 49475fbd0..49c303256 100644
--- a/data/presets/presets/manhole.json
+++ b/data/presets/presets/manhole.json
@@ -13,6 +13,10 @@
     "tags": {
         "manhole": "*"
     },
+    "addTags": {
+        "man_made": "manhole",
+        "manhole": "*"
+    },
     "terms": [
         "cover",
         "hole",
diff --git a/data/presets/presets/manhole/drain.json b/data/presets/presets/manhole/drain.json
index 917a79b84..1046f0398 100644
--- a/data/presets/presets/manhole/drain.json
+++ b/data/presets/presets/manhole/drain.json
@@ -11,6 +11,10 @@
     "tags": {
         "manhole": "drain"
     },
+    "addTags": {
+        "man_made": "manhole",
+        "manhole": "drain"
+    },
     "terms": [
         "cover",
         "drain",
diff --git a/data/presets/presets/manhole/telecom.json b/data/presets/presets/manhole/telecom.json
index 426f8984e..2a0cdba4d 100644
--- a/data/presets/presets/manhole/telecom.json
+++ b/data/presets/presets/manhole/telecom.json
@@ -11,6 +11,10 @@
     "tags": {
         "manhole": "telecom"
     },
+    "addTags": {
+        "man_made": "manhole",
+        "manhole": "telecom"
+    },
     "terms": [
         "cover",
         "phone",