diff --git a/data/presets/presets.json b/data/presets/presets.json
index 84fcb743e..67ffdc118 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -986,16 +986,16 @@
     "tourism/viewpoint": {"icon": "temaki-binoculars", "geometry": ["point", "vertex"], "fields": ["direction"], "tags": {"tourism": "viewpoint"}, "name": "Viewpoint"},
     "tourism/wilderness_hut": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "fireplace"], "geometry": ["point", "area"], "terms": ["wilderness hut", "backcountry hut", "bothy"], "tags": {"tourism": "wilderness_hut"}, "name": "Wilderness Hut"},
     "tourism/zoo": {"icon": "maki-zoo", "fields": ["name", "operator", "address", "opening_hours"], "geometry": ["point", "area"], "terms": ["animal"], "tags": {"tourism": "zoo"}, "name": "Zoo"},
-    "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "direction_vertex"], "geometry": ["vertex", "line"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
+    "traffic_calming": {"icon": "temaki-diamond", "fields": ["traffic_calming", "surface", "direction_vertex"], "geometry": ["vertex", "line", "area"], "tags": {"traffic_calming": "*"}, "terms": ["bump", "hump", "slow", "speed"], "name": "Traffic Calming"},
     "traffic_calming/bump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["hump", "speed", "slow"], "tags": {"traffic_calming": "bump"}, "name": "Speed Bump"},
-    "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"},
-    "traffic_calming/choker": {"icon": "temaki-diamond", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "choker"}, "name": "Traffic Choker"},
+    "traffic_calming/chicane": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "area"], "terms": ["driveway link", "speed", "slow"], "tags": {"traffic_calming": "chicane"}, "name": "Traffic Chicane"},
+    "traffic_calming/choker": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "area"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "choker"}, "name": "Traffic Choker"},
     "traffic_calming/cushion": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "hump", "speed", "slow"], "tags": {"traffic_calming": "cushion"}, "name": "Speed Cushion"},
     "traffic_calming/dip": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["speed", "slow"], "tags": {"traffic_calming": "dip"}, "name": "Dip"},
     "traffic_calming/hump": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex", "line"], "terms": ["bump", "speed", "slow"], "tags": {"traffic_calming": "hump"}, "name": "Speed Hump"},
-    "traffic_calming/island": {"icon": "temaki-diamond", "geometry": ["vertex"], "terms": ["circle", "roundabout", "slow"], "tags": {"traffic_calming": "island"}, "name": "Traffic Island"},
+    "traffic_calming/island": {"icon": "temaki-diamond", "fields": ["surface"], "geometry": ["vertex", "area"], "terms": ["circle", "roundabout", "slow"], "tags": {"traffic_calming": "island"}, "name": "Traffic Island"},
     "traffic_calming/rumble_strip": {"icon": "temaki-diamond", "fields": ["direction_vertex"], "geometry": ["vertex", "line"], "terms": ["audible lines", "sleeper lines", "growlers"], "tags": {"traffic_calming": "rumble_strip"}, "name": "Rumble Strip"},
-    "traffic_calming/table": {"icon": "temaki-diamond", "fields": ["surface"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"},
+    "traffic_calming/table": {"icon": "temaki-diamond", "fields": ["surface", "direction_vertex"], "geometry": ["vertex"], "tags": {"traffic_calming": "table"}, "terms": ["flat top", "hump", "speed", "slow"], "name": "Speed Table"},
     "traffic_sign_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction"], "geometry": ["vertex"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
     "traffic_sign": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "direction"], "geometry": ["point"], "tags": {"traffic_sign": "*"}, "terms": ["road", "highway"], "name": "Traffic Sign"},
     "traffic_sign/city_limit_vertex": {"icon": "maki-square-stroked", "fields": ["traffic_sign", "traffic_sign/direction", "name"], "geometry": ["vertex"], "tags": {"traffic_sign": "city_limit"}, "terms": ["town", "village", "hamlet", "boundary", "edge", "border", "road", "highway"], "name": "City Limit Sign"},
diff --git a/data/presets/presets/traffic_calming.json b/data/presets/presets/traffic_calming.json
index 520ce7ec0..c1edbf74c 100644
--- a/data/presets/presets/traffic_calming.json
+++ b/data/presets/presets/traffic_calming.json
@@ -2,11 +2,13 @@
     "icon": "temaki-diamond",
     "fields": [
         "traffic_calming",
+        "surface",
         "direction_vertex"
     ],
     "geometry": [
         "vertex",
-        "line"
+        "line",
+        "area"
     ],
     "tags": {
         "traffic_calming": "*"
diff --git a/data/presets/presets/traffic_calming/chicane.json b/data/presets/presets/traffic_calming/chicane.json
index 2a2cead7a..6e56f64fe 100644
--- a/data/presets/presets/traffic_calming/chicane.json
+++ b/data/presets/presets/traffic_calming/chicane.json
@@ -1,11 +1,12 @@
 {
     "icon": "temaki-diamond",
     "fields": [
+        "surface",
         "direction_vertex"
     ],
     "geometry": [
         "vertex",
-        "line"
+        "area"
     ],
     "terms": [
         "driveway link",
diff --git a/data/presets/presets/traffic_calming/choker.json b/data/presets/presets/traffic_calming/choker.json
index 51683d807..4cad61221 100644
--- a/data/presets/presets/traffic_calming/choker.json
+++ b/data/presets/presets/traffic_calming/choker.json
@@ -1,11 +1,12 @@
 {
     "icon": "temaki-diamond",
     "fields": [
+        "surface",
         "direction_vertex"
     ],
     "geometry": [
         "vertex",
-        "line"
+        "area"
     ],
     "terms": [
         "speed",
diff --git a/data/presets/presets/traffic_calming/island.json b/data/presets/presets/traffic_calming/island.json
index 10a49d3de..0ae58511f 100644
--- a/data/presets/presets/traffic_calming/island.json
+++ b/data/presets/presets/traffic_calming/island.json
@@ -1,7 +1,11 @@
 {
     "icon": "temaki-diamond",
+    "fields": [
+        "surface"
+    ],
     "geometry": [
-        "vertex"
+        "vertex",
+        "area"
     ],
     "terms": [
         "circle",
diff --git a/data/presets/presets/traffic_calming/table.json b/data/presets/presets/traffic_calming/table.json
index fe4b4340d..58e1371de 100644
--- a/data/presets/presets/traffic_calming/table.json
+++ b/data/presets/presets/traffic_calming/table.json
@@ -1,7 +1,8 @@
 {
     "icon": "temaki-diamond",
     "fields": [
-        "surface"
+        "surface",
+        "direction_vertex"
     ],
     "geometry": [
         "vertex"
diff --git a/data/taginfo.json b/data/taginfo.json
index 8e25ef493..4ce316d80 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -6459,7 +6459,7 @@
     {
       "key": "traffic_calming",
       "description": "🄿 Traffic Calming, 🄵 Type",
-      "object_types": ["node", "way"],
+      "object_types": ["node", "way", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"
     },
     {
@@ -6473,14 +6473,14 @@
       "key": "traffic_calming",
       "value": "chicane",
       "description": "🄿 Traffic Chicane",
-      "object_types": ["node", "way"],
+      "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"
     },
     {
       "key": "traffic_calming",
       "value": "choker",
       "description": "🄿 Traffic Choker",
-      "object_types": ["node", "way"],
+      "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"
     },
     {
@@ -6508,7 +6508,7 @@
       "key": "traffic_calming",
       "value": "island",
       "description": "🄿 Traffic Island",
-      "object_types": ["node"],
+      "object_types": ["node", "area"],
       "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/diamond.svg?sanitize=true"
     },
     {