diff --git a/data/deprecated.json b/data/deprecated.json
index 2d0cacc68..1e352c77d 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -364,6 +364,30 @@
       "old": {"generator:source": "photovoltaic"},
       "replace": {"generator:source": "solar", "generator:method": "photovoltaic"}
     },
+    {
+      "old": {"golf": "faiway"},
+      "replace": {"golf": "fairway"}
+    },
+    {
+      "old": {"golf": "putting_green"},
+      "replace": {"golf": "green"}
+    },
+    {
+      "old": {"golf": "sand_trap"},
+      "replace": {"golf": "bunker"}
+    },
+    {
+      "old": {"golf": "tee_area"},
+      "replace": {"golf": "tee"}
+    },
+    {
+      "old": {"golf": "tee_box"},
+      "replace": {"golf": "tee"}
+    },
+    {
+      "old": {"golf": "teebox"},
+      "replace": {"golf": "tee"}
+    },
     {
       "old": {"highway": "abandoned"},
       "replace": {"abandoned:highway": "*"}
@@ -487,6 +511,10 @@
       "old": {"leisure": "club"},
       "replace": {"club": "*"}
     },
+    {
+      "old": {"leisure": "golf_pin"},
+      "replace": {"golf": "pin"}
+    },
     {
       "old": {"leisure": "ice_rink", "sport": "hockey"},
       "replace": {"leisure": "ice_rink", "sport": "ice_hockey"}
diff --git a/data/presets.yaml b/data/presets.yaml
index eaefe96ec..406680c84 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -4424,7 +4424,7 @@ en:
         # ford=*
         name: Ford
       golf/bunker:
-        # 'golf=bunker, natural=sand'
+        # golf=bunker
         name: Sand Trap
         # 'terms: hazard,bunker'
         terms: '<translate with synonyms or related terms for ''Sand Trap'', separated by commas>'
@@ -4433,15 +4433,15 @@ en:
         name: Golf Cartpath
         terms: '<translate with synonyms or related terms for ''Golf Cartpath'', separated by commas>'
       golf/driving_range:
-        # 'golf=driving_range, landuse=grass'
+        # golf=driving_range
         name: Driving Range
         terms: '<translate with synonyms or related terms for ''Driving Range'', separated by commas>'
       golf/fairway:
-        # 'golf=fairway, landuse=grass'
+        # golf=fairway
         name: Fairway
         terms: '<translate with synonyms or related terms for ''Fairway'', separated by commas>'
       golf/green:
-        # 'golf=green, landuse=grass, leisure=pitch, sport=golf'
+        # golf=green
         name: Putting Green
         terms: '<translate with synonyms or related terms for ''Putting Green'', separated by commas>'
       golf/hole:
@@ -4449,7 +4449,7 @@ en:
         name: Golf Hole
         terms: '<translate with synonyms or related terms for ''Golf Hole'', separated by commas>'
       golf/lateral_water_hazard:
-        # 'golf=lateral_water_hazard, natural=water'
+        # golf=lateral_water_hazard
         name: Lateral Water Hazard
         terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
       golf/path:
@@ -4457,16 +4457,16 @@ en:
         name: Golf Walking Path
         terms: '<translate with synonyms or related terms for ''Golf Walking Path'', separated by commas>'
       golf/rough:
-        # 'golf=rough, landuse=grass'
+        # golf=rough
         name: Rough
         terms: '<translate with synonyms or related terms for ''Rough'', separated by commas>'
       golf/tee:
-        # 'golf=tee, landuse=grass'
+        # golf=tee
         name: Tee Box
         # 'terms: teeing ground'
         terms: '<translate with synonyms or related terms for ''Tee Box'', separated by commas>'
       golf/water_hazard:
-        # 'golf=water_hazard, natural=water'
+        # golf=water_hazard
         name: Water Hazard
         terms: '<translate with synonyms or related terms for ''Water Hazard'', separated by commas>'
       healthcare:
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 2b33eff28..e6ae8794f 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -435,17 +435,17 @@
     "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"},
     "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "door", "access_simple", "address"], "matchScore": 0.8, "name": "Entrance/Exit"},
     "ford": {"icon": "temaki-pedestrian", "fields": ["name", "access", "seasonal"], "geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
-    "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "reference": {"key": "golf", "value": "bunker"}, "name": "Sand Trap"},
-    "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath"},
-    "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range", "landuse": "grass"}, "reference": {"key": "golf", "value": "driving_range"}, "name": "Driving Range"},
-    "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway", "landuse": "grass"}, "reference": {"key": "golf", "value": "fairway"}, "name": "Fairway"},
-    "golf/green": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green", "landuse": "grass", "leisure": "pitch", "sport": "golf"}, "reference": {"key": "golf", "value": "green"}, "name": "Putting Green"},
+    "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker"}, "addTags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "name": "Sand Trap"},
+    "golf/cartpath": {"icon": "temaki-golf_cart", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"golf": "cartpath"}, "addTags": {"golf": "cartpath", "golf_cart": "designated", "highway": "service"}, "name": "Golf Cartpath"},
+    "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range"}, "addTags": {"golf": "driving_range", "landuse": "grass"}, "name": "Driving Range"},
+    "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway"}, "addTags": {"golf": "fairway", "landuse": "grass"}, "name": "Fairway"},
+    "golf/green": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green"}, "addTags": {"golf": "green", "landuse": "grass"}, "name": "Putting Green"},
     "golf/hole": {"icon": "maki-golf", "fields": ["name", "ref_golf_hole", "par", "handicap"], "geometry": ["line"], "tags": {"golf": "hole"}, "name": "Golf Hole"},
-    "golf/lateral_water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "lateral_water_hazard"}, "name": "Lateral Water Hazard"},
-    "golf/path": {"icon": "maki-golf", "fields": ["name", "surface", "width", "structure", "incline"], "geometry": ["line"], "tags": {"golf": "path"}, "addTags": {"golf": "path", "highway": "path", "foot": "designated"}, "reference": {"key": "golf", "value": "path"}, "name": "Golf Walking Path"},
-    "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough", "landuse": "grass"}, "reference": {"key": "golf", "value": "rough"}, "name": "Rough"},
-    "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "reference": {"key": "golf", "value": "tee"}, "name": "Tee Box"},
-    "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"},
+    "golf/lateral_water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard"}, "addTags": {"golf": "lateral_water_hazard", "natural": "water"}, "name": "Lateral Water Hazard"},
+    "golf/path": {"icon": "maki-golf", "fields": ["name", "surface", "width", "structure", "incline"], "geometry": ["line"], "tags": {"golf": "path"}, "addTags": {"golf": "path", "highway": "path", "foot": "designated"}, "name": "Golf Walking Path"},
+    "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough"}, "addTags": {"golf": "rough", "landuse": "grass"}, "name": "Rough"},
+    "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee"}, "addTags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "name": "Tee Box"},
+    "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard"}, "addTags": {"golf": "water_hazard", "natural": "water"}, "name": "Water Hazard"},
     "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["building/levels_building", "height_building", "opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
     "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"},
     "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"},
diff --git a/data/presets/presets/golf/bunker.json b/data/presets/presets/golf/bunker.json
index 5a2b23469..6528c5f67 100644
--- a/data/presets/presets/golf/bunker.json
+++ b/data/presets/presets/golf/bunker.json
@@ -7,6 +7,9 @@
         "area"
     ],
     "tags": {
+        "golf": "bunker"
+    },
+    "addTags": {
         "golf": "bunker",
         "natural": "sand"
     },
@@ -14,9 +17,5 @@
         "hazard",
         "bunker"
     ],
-    "reference": {
-        "key": "golf",
-        "value": "bunker"
-    },
     "name": "Sand Trap"
 }
diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json
index 2436f70c3..acf329fb5 100644
--- a/data/presets/presets/golf/cartpath.json
+++ b/data/presets/presets/golf/cartpath.json
@@ -15,9 +15,5 @@
         "golf_cart": "designated",
         "highway": "service"
     },
-    "reference": {
-        "key": "golf",
-        "value": "cartpath"
-    },
     "name": "Golf Cartpath"
 }
diff --git a/data/presets/presets/golf/driving_range.json b/data/presets/presets/golf/driving_range.json
index 4db26eada..febe87962 100644
--- a/data/presets/presets/golf/driving_range.json
+++ b/data/presets/presets/golf/driving_range.json
@@ -8,12 +8,11 @@
         "area"
     ],
     "tags": {
+        "golf": "driving_range"
+    },
+    "addTags": {
         "golf": "driving_range",
         "landuse": "grass"
     },
-    "reference": {
-        "key": "golf",
-        "value": "driving_range"
-    },
     "name": "Driving Range"
 }
diff --git a/data/presets/presets/golf/fairway.json b/data/presets/presets/golf/fairway.json
index 1be342968..65d0de85e 100644
--- a/data/presets/presets/golf/fairway.json
+++ b/data/presets/presets/golf/fairway.json
@@ -7,12 +7,11 @@
         "area"
     ],
     "tags": {
+        "golf": "fairway"
+    },
+    "addTags": {
         "golf": "fairway",
         "landuse": "grass"
     },
-    "reference": {
-        "key": "golf",
-        "value": "fairway"
-    },
     "name": "Fairway"
 }
diff --git a/data/presets/presets/golf/green.json b/data/presets/presets/golf/green.json
index 3a7038bf8..4d6f8b91d 100644
--- a/data/presets/presets/golf/green.json
+++ b/data/presets/presets/golf/green.json
@@ -7,14 +7,11 @@
         "area"
     ],
     "tags": {
-        "golf": "green",
-        "landuse": "grass",
-        "leisure": "pitch",
-        "sport": "golf"
+        "golf": "green"
     },
-    "reference": {
-        "key": "golf",
-        "value": "green"
+    "addTags": {
+        "golf": "green",
+        "landuse": "grass"
     },
     "name": "Putting Green"
 }
diff --git a/data/presets/presets/golf/lateral_water_hazard.json b/data/presets/presets/golf/lateral_water_hazard.json
index 0405a55f3..16e04513b 100644
--- a/data/presets/presets/golf/lateral_water_hazard.json
+++ b/data/presets/presets/golf/lateral_water_hazard.json
@@ -7,12 +7,11 @@
         "area"
     ],
     "tags": {
+        "golf": "lateral_water_hazard"
+    },
+    "addTags": {
         "golf": "lateral_water_hazard",
         "natural": "water"
     },
-    "reference": {
-        "key": "golf",
-        "value": "lateral_water_hazard"
-    },
     "name": "Lateral Water Hazard"
 }
diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json
index 7bc51b770..3627d3dea 100644
--- a/data/presets/presets/golf/path.json
+++ b/data/presets/presets/golf/path.json
@@ -18,9 +18,5 @@
         "highway": "path",
         "foot": "designated"
     },
-    "reference": {
-        "key": "golf",
-        "value": "path"
-    },
     "name": "Golf Walking Path"
 }
diff --git a/data/presets/presets/golf/rough.json b/data/presets/presets/golf/rough.json
index 11f03e524..d65942c5c 100644
--- a/data/presets/presets/golf/rough.json
+++ b/data/presets/presets/golf/rough.json
@@ -7,12 +7,11 @@
         "area"
     ],
     "tags": {
+        "golf": "rough"
+    },
+    "addTags": {
         "golf": "rough",
         "landuse": "grass"
     },
-    "reference": {
-        "key": "golf",
-        "value": "rough"
-    },
     "name": "Rough"
 }
diff --git a/data/presets/presets/golf/tee.json b/data/presets/presets/golf/tee.json
index 4ea9aab2e..03ff2b32e 100644
--- a/data/presets/presets/golf/tee.json
+++ b/data/presets/presets/golf/tee.json
@@ -7,15 +7,14 @@
         "area"
     ],
     "tags": {
+        "golf": "tee"
+    },
+    "addTags": {
         "golf": "tee",
         "landuse": "grass"
     },
     "terms": [
         "teeing ground"
     ],
-    "reference": {
-        "key": "golf",
-        "value": "tee"
-    },
     "name": "Tee Box"
 }
diff --git a/data/presets/presets/golf/water_hazard.json b/data/presets/presets/golf/water_hazard.json
index a36492fce..5c9e36289 100644
--- a/data/presets/presets/golf/water_hazard.json
+++ b/data/presets/presets/golf/water_hazard.json
@@ -7,12 +7,11 @@
         "area"
     ],
     "tags": {
+        "golf": "water_hazard"
+    },
+    "addTags": {
         "golf": "water_hazard",
         "natural": "water"
     },
-    "reference": {
-        "key": "golf",
-        "value": "water_hazard"
-    },
     "name": "Water Hazard"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 184d1ab7e..567d042a3 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -431,13 +431,17 @@
     {"key": "emergency", "value": "water_tank", "description": "🄿 Emergency Water Tank", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/entrance-alt1-15.svg"},
     {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/pedestrian.svg"},
-    {"key": "natural", "value": "sand", "description": "🄿 Sand Trap, 🄿 Sand", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "bunker", "description": "🄿 Sand Trap", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "golf", "value": "cartpath", "description": "🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/golf_cart.svg"},
-    {"key": "landuse", "value": "grass", "description": "🄿 Driving Range, 🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
-    {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "driving_range", "description": "🄿 Driving Range", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "fairway", "description": "🄿 Fairway", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "green", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
-    {"key": "natural", "value": "water", "description": "🄿 Lateral Water Hazard, 🄿 Water Hazard, 🄿 Water", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "lateral_water_hazard", "description": "🄿 Lateral Water Hazard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "golf", "value": "path", "description": "🄿 Golf Walking Path", "object_types": ["way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "rough", "description": "🄿 Rough", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "tee", "description": "🄿 Tee Box", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
+    {"key": "golf", "value": "water_hazard", "description": "🄿 Water Hazard", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/golf-15.svg"},
     {"key": "healthcare", "description": "🄿 Healthcare Facility, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "healthcare", "value": "alternative", "description": "🄿 Alternative Medicine", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
     {"key": "healthcare:speciality", "value": "chiropractic", "description": "🄿 Chiropractor", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/hospital-15.svg"},
@@ -560,6 +564,7 @@
     {"key": "landuse", "value": "flowerbed", "description": "🄿 Flowerbed", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "landuse", "value": "forest", "description": "🄿 Managed Forest", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-alt1-15.svg"},
     {"key": "landuse", "value": "garages", "description": "🄿 Garage Landuse", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/fontawesome/fas-warehouse.svg"},
+    {"key": "landuse", "value": "grass", "description": "🄿 Grass", "object_types": ["area"]},
     {"key": "landuse", "value": "greenfield", "description": "🄿 Greenfield", "object_types": ["area"]},
     {"key": "landuse", "value": "greenhouse_horticulture", "description": "🄿 Greenhouse Horticulture", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/garden-15.svg"},
     {"key": "landuse", "value": "harbour", "description": "🄿 Harbor", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/harbor-15.svg"},
@@ -747,6 +752,7 @@
     {"key": "natural", "value": "ridge", "description": "🄿 Ridge", "object_types": ["way"]},
     {"key": "natural", "value": "rock", "description": "🄿 Attached Rock / Boulder", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/bhousel/temaki/icons/boulder2.svg"},
     {"key": "natural", "value": "saddle", "description": "🄿 Saddle", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"},
+    {"key": "natural", "value": "sand", "description": "🄿 Sand", "object_types": ["area"]},
     {"key": "natural", "value": "scree", "description": "🄿 Scree", "object_types": ["area"]},
     {"key": "natural", "value": "scrub", "description": "🄿 Scrub", "object_types": ["area"]},
     {"key": "natural", "value": "shingle", "description": "🄿 Shingle", "object_types": ["area"]},
@@ -756,6 +762,7 @@
     {"key": "natural", "value": "tree", "description": "🄿 Tree", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/park-15.svg"},
     {"key": "natural", "value": "valley", "description": "🄿 Valley", "object_types": ["node", "way"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/triangle-stroked-15.svg"},
     {"key": "natural", "value": "volcano", "description": "🄿 Volcano", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/volcano-15.svg"},
+    {"key": "natural", "value": "water", "description": "🄿 Water", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "basin", "description": "🄿 Basin", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
     {"key": "water", "value": "canal", "description": "🄿 Canal", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/openstreetmap/iD/svg/iD-sprite/presets/waterway-canal.svg"},
     {"key": "water", "value": "lake", "description": "🄿 Lake", "object_types": ["area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/water-15.svg"},
@@ -1909,6 +1916,12 @@
     {"key": "footway", "value": "right", "description": "🄳 ➜ sidewalk=right"},
     {"key": "footway", "value": "separate", "description": "🄳 ➜ sidewalk=separate"},
     {"key": "generator:source", "value": "photovoltaic", "description": "🄳 ➜ generator:source=solar + generator:method=photovoltaic"},
+    {"key": "golf", "value": "faiway", "description": "🄳 ➜ golf=fairway"},
+    {"key": "golf", "value": "putting_green", "description": "🄳 ➜ golf=green"},
+    {"key": "golf", "value": "sand_trap", "description": "🄳 ➜ golf=bunker"},
+    {"key": "golf", "value": "tee_area", "description": "🄳 ➜ golf=tee"},
+    {"key": "golf", "value": "tee_box", "description": "🄳 ➜ golf=tee"},
+    {"key": "golf", "value": "teebox", "description": "🄳 ➜ golf=tee"},
     {"key": "highway", "value": "abandoned", "description": "🄳 ➜ abandoned:highway=*"},
     {"key": "highway", "value": "ford", "description": "🄳 ➜ ford=*"},
     {"key": "highway", "value": "no", "description": "🄳"},
@@ -1932,6 +1945,7 @@
     {"key": "landuse", "value": "wood", "description": "🄳 ➜ natural=wood"},
     {"key": "leisure", "value": "beach", "description": "🄳 ➜ natural=beach"},
     {"key": "leisure", "value": "club", "description": "🄳 ➜ club=*"},
+    {"key": "leisure", "value": "golf_pin", "description": "🄳 ➜ golf=pin"},
     {"key": "leisure", "value": "social_club", "description": "🄳 ➜ club=*"},
     {"key": "leisure", "value": "video_arcade", "description": "🄳 ➜ leisure=amusement_arcade"},
     {"key": "leisure", "value": "recreation_ground", "description": "🄳 ➜ landuse=recreation_ground"},