diff --git a/data/presets.yaml b/data/presets.yaml
index 36e4b4805..715d53e69 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -3900,9 +3900,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Dark Ride'', separated by commas>'
       attraction/drop_tower:
         # attraction=drop_tower
-        name: Drop Tower
+        name: Drop Tower Ride
         # 'terms: theme park,amusement ride,gondola,tower,big drop'
-        terms: '<translate with synonyms or related terms for ''Drop Tower'', separated by commas>'
+        terms: '<translate with synonyms or related terms for ''Drop Tower Ride'', separated by commas>'
       attraction/kiddie_ride:
         # attraction=kiddie_ride
         name: Kiddie Ride
@@ -5332,7 +5332,7 @@ en:
       landuse/forest:
         # landuse=forest
         name: Managed Forest
-        # 'terms: cut,forest,forestry,lumber,silviculture,tree,trees'
+        # 'terms: boreal,cut,forest,forestry,forrest,lumber,silviculture,taiga,tree,trees,woodlands,woods'
         terms: '<translate with synonyms or related terms for ''Managed Forest'', separated by commas>'
       landuse/garages:
         # landuse=garages
@@ -5341,6 +5341,7 @@ en:
       landuse/grass:
         # landuse=grass
         name: Grass
+        # 'terms: field,green,lawn,managed grass,mown grass,turf'
         terms: '<translate with synonyms or related terms for ''Grass'', separated by commas>'
       landuse/greenfield:
         # landuse=greenfield
@@ -6290,7 +6291,7 @@ en:
       natural/grassland:
         # natural=grassland
         name: Grassland
-        # 'terms: prairie,savanna'
+        # 'terms: field,prairie,savanna'
         terms: '<translate with synonyms or related terms for ''Grassland'', separated by commas>'
       natural/heath:
         # natural=heath
@@ -6428,7 +6429,7 @@ en:
       natural/wood:
         # natural=wood
         name: Natural Wood
-        # 'terms: tree,trees'
+        # 'terms: boreal,forest,forrest,taiga,tree,trees,woodlands,woods'
         terms: '<translate with synonyms or related terms for ''Natural Wood'', separated by commas>'
       network/type/node_network:
         # 'network:type=node_network'
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 76af76d23..1bd556487 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -281,7 +281,7 @@
     "attraction/bungee_jumping": {"icon": "maki-pitch", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "bungy jumping", "jumping platform"], "tags": {"attraction": "bungee_jumping"}, "name": "Bungee Jumping"},
     "attraction/carousel": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "roundabout", "merry-go-round", "galloper", "jumper", "horseabout", "flying horses"], "tags": {"attraction": "carousel"}, "name": "Carousel"},
     "attraction/dark_ride": {"icon": "maki-rail-metro", "fields": ["{attraction}", "building_area"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "line", "area"], "terms": ["theme park", "ghost train"], "tags": {"attraction": "dark_ride"}, "name": "Dark Ride"},
-    "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower"},
+    "attraction/drop_tower": {"icon": "temaki-tower", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "gondola", "tower", "big drop"], "tags": {"attraction": "drop_tower"}, "name": "Drop Tower Ride"},
     "attraction/kiddie_ride": {"icon": "temaki-amusement_park", "fields": ["{attraction}", "fee", "payment_multi_fee", "charge_fee"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point"], "tags": {"attraction": "kiddie_ride"}, "name": "Kiddie Ride"},
     "attraction/log_flume": {"icon": "maki-ferry", "fields": ["{attraction}", "height"], "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "flume"], "tags": {"attraction": "log_flume"}, "name": "Log Flume"},
     "attraction/maze": {"icon": "maki-amusement-park", "moreFields": ["{attraction}", "max_age", "min_age"], "geometry": ["point", "area"], "terms": ["theme park", "amusement ride", "labyrinth"], "tags": {"attraction": "maze"}, "name": "Maze"},
@@ -600,9 +600,9 @@
     "landuse/farmland": {"icon": "fas-tractor", "fields": ["name", "operator", "crop", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmland"}, "terms": ["crop", "grow", "plant"], "name": "Farmland"},
     "landuse/farmyard": {"icon": "maki-farm", "fields": ["name", "operator", "crop"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "farmyard"}, "terms": ["crop", "grow", "plant"], "name": "Farmyard"},
     "landuse/flowerbed": {"icon": "maki-garden", "fields": ["operator"], "moreFields": ["address", "name"], "geometry": ["area"], "tags": {"landuse": "flowerbed"}, "terms": ["floral garden", "flower garden"], "name": "Flowerbed"},
-    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["cut", "forest", "forestry", "lumber", "silviculture", "tree", "trees"], "name": "Managed Forest"},
+    "landuse/forest": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle", "produce"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "tags": {"landuse": "forest"}, "terms": ["boreal", "cut", "forest", "forestry", "forrest", "lumber", "silviculture", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Managed Forest"},
     "landuse/garages": {"icon": "fas-warehouse", "geometry": ["area"], "fields": ["name"], "moreFields": ["address", "email", "fax", "phone", "website"], "tags": {"landuse": "garages"}, "terms": [], "name": "Garage Landuse"},
-    "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": [], "name": "Grass"},
+    "landuse/grass": {"geometry": ["area"], "tags": {"landuse": "grass"}, "terms": ["field", "green", "lawn", "managed grass", "mown grass", "turf"], "name": "Grass"},
     "landuse/greenfield": {"icon": "temaki-bulldozer", "geometry": ["area"], "fields": ["name"], "tags": {"landuse": "greenfield"}, "terms": [], "matchScore": 0.9, "name": "Greenfield"},
     "landuse/greenhouse_horticulture": {"icon": "maki-garden", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["flower", "greenhouse", "horticulture", "grow", "vivero"], "tags": {"landuse": "greenhouse_horticulture"}, "matchScore": 0.9, "name": "Greenhouse Horticulture"},
     "landuse/harbour": {"icon": "maki-harbor", "fields": ["name", "operator"], "moreFields": ["address", "email", "fax", "phone", "website"], "geometry": ["area"], "terms": ["boat"], "tags": {"landuse": "harbour"}, "name": "Harbor"},
@@ -798,7 +798,7 @@
     "natural/coastline": {"geometry": ["line"], "tags": {"natural": "coastline"}, "terms": ["shore"], "name": "Coastline"},
     "natural/fell": {"geometry": ["area"], "tags": {"natural": "fell"}, "terms": [], "name": "Fell"},
     "natural/glacier": {"icon": "temaki-snow", "geometry": ["area"], "tags": {"natural": "glacier"}, "terms": ["ice", "snow"], "name": "Glacier"},
-    "natural/grassland": {"geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["prairie", "savanna"], "name": "Grassland"},
+    "natural/grassland": {"geometry": ["area"], "tags": {"natural": "grassland"}, "terms": ["field", "prairie", "savanna"], "name": "Grassland"},
     "natural/heath": {"geometry": ["area"], "tags": {"natural": "heath"}, "terms": [], "name": "Heath"},
     "natural/mud": {"geometry": ["area"], "tags": {"natural": "mud"}, "terms": ["wetland"], "name": "Mud"},
     "natural/peak": {"icon": "maki-mountain", "fields": ["name", "elevation"], "geometry": ["point", "vertex"], "tags": {"natural": "peak"}, "terms": ["acme", "aiguille", "alp", "climax", "crest", "crown", "hill", "mount", "mountain", "pinnacle", "summit", "tip", "top"], "name": "Peak"},
@@ -827,7 +827,7 @@
     "natural/water/stream": {"icon": "iD-waterway-stream", "fields": ["{natural/water}"], "geometry": ["area"], "tags": {"natural": "water", "water": "stream"}, "reference": {"key": "water", "value": "stream"}, "terms": ["beck", "branch", "brook", "burn", "course", "creek", "current", "drift", "flood", "flow", "freshet", "race", "rill", "rindle", "rivulet", "run", "runnel", "rush", "spate", "spritz", "surge", "tide", "torrent", "tributary", "watercourse"], "name": "Stream Area"},
     "natural/water/wastewater": {"icon": "temaki-waste", "geometry": ["area"], "tags": {"natural": "water", "water": "wastewater"}, "reference": {"key": "water", "value": "wastewater"}, "terms": ["excrement", "shit", "sewage", "wastewater", "Settling Basin", "Clarifier Basin"], "name": "Wastewater Basin"},
     "natural/wetland": {"icon": "maki-wetland", "fields": ["wetland", "salt", "tidal"], "geometry": ["point", "area"], "tags": {"natural": "wetland"}, "terms": ["bog", "fen", "marsh", "mire", "moor", "muskeg", "peatland", "quagmire", "reedbed", "saltmarsh", "swamp", "tidalflat", "wet meadow"], "name": "Wetland"},
-    "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["tree", "trees"], "name": "Natural Wood"},
+    "natural/wood": {"icon": "maki-park-alt1", "fields": ["name", "leaf_type", "leaf_cycle"], "geometry": ["point", "area"], "tags": {"natural": "wood"}, "terms": ["boreal", "forest", "forrest", "taiga", "tree", "trees", "woodlands", "woods"], "name": "Natural Wood"},
     "network/type/node_network": {"fields": ["name", "rwn_ref", "rcn_ref"], "geometry": ["vertex"], "tags": {"network:type": "node_network"}, "terms": ["node network", "rcn", "rwn"], "countryCodes": ["be", "de", "lu", "nl"], "matchScore": 0.2, "name": "Recreational Network Node"},
     "noexit/yes": {"icon": "maki-barrier", "geometry": ["vertex"], "terms": ["no exit", "road end", "dead end"], "tags": {"noexit": "yes"}, "reference": {"key": "noexit", "value": "*"}, "name": "No Exit"},
     "office": {"icon": "maki-suitcase", "fields": ["name", "office", "address", "building_area", "opening_hours"], "moreFields": ["air_conditioning", "building/levels_building", "email", "fax", "gnis/feature_id", "height_building", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "not/name", "operator", "phone", "ref/vatin", "smoking", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"office": "*"}, "terms": [], "name": "Office"},
diff --git a/data/presets/presets/attraction/drop_tower.json b/data/presets/presets/attraction/drop_tower.json
index 80f169990..180da561a 100644
--- a/data/presets/presets/attraction/drop_tower.json
+++ b/data/presets/presets/attraction/drop_tower.json
@@ -23,5 +23,5 @@
     "tags": {
         "attraction": "drop_tower"
     },
-    "name": "Drop Tower"
+    "name": "Drop Tower Ride"
 }
diff --git a/data/presets/presets/landuse/forest.json b/data/presets/presets/landuse/forest.json
index 70b186e73..f20df8316 100644
--- a/data/presets/presets/landuse/forest.json
+++ b/data/presets/presets/landuse/forest.json
@@ -20,13 +20,18 @@
         "landuse": "forest"
     },
     "terms": [
+        "boreal",
         "cut",
         "forest",
         "forestry",
+        "forrest",
         "lumber",
         "silviculture",
+        "taiga",
         "tree",
-        "trees"
+        "trees",
+        "woodlands",
+        "woods"
     ],
     "name": "Managed Forest"
 }
diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json
index 8d1fdfa80..b8964772b 100644
--- a/data/presets/presets/landuse/grass.json
+++ b/data/presets/presets/landuse/grass.json
@@ -5,6 +5,13 @@
     "tags": {
         "landuse": "grass"
     },
-    "terms": [],
+    "terms": [
+        "field",
+        "green",
+        "lawn",
+        "managed grass",
+        "mown grass",
+        "turf"
+    ],
     "name": "Grass"
 }
diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json
index 4c6d7f7c9..24addf880 100644
--- a/data/presets/presets/natural/grassland.json
+++ b/data/presets/presets/natural/grassland.json
@@ -6,6 +6,7 @@
         "natural": "grassland"
     },
     "terms": [
+        "field",
         "prairie",
         "savanna"
     ],
diff --git a/data/presets/presets/natural/wood.json b/data/presets/presets/natural/wood.json
index 32f4fa83e..d607d3327 100644
--- a/data/presets/presets/natural/wood.json
+++ b/data/presets/presets/natural/wood.json
@@ -13,8 +13,14 @@
         "natural": "wood"
     },
     "terms": [
+        "boreal",
+        "forest",
+        "forrest",
+        "taiga",
         "tree",
-        "trees"
+        "trees",
+        "woodlands",
+        "woods"
     ],
     "name": "Natural Wood"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 1d8eb3cbf..b1e4d54c0 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -278,7 +278,7 @@
     {"key": "attraction", "value": "bungee_jumping", "description": "🄿 Bungee Jumping", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/pitch-15.svg"},
     {"key": "attraction", "value": "carousel", "description": "🄿 Carousel", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/amusement_park.svg"},
     {"key": "attraction", "value": "dark_ride", "description": "🄿 Dark Ride", "object_types": ["node", "way", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/rail-metro-15.svg"},
-    {"key": "attraction", "value": "drop_tower", "description": "🄿 Drop Tower", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tower.svg"},
+    {"key": "attraction", "value": "drop_tower", "description": "🄿 Drop Tower Ride", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/tower.svg"},
     {"key": "attraction", "value": "kiddie_ride", "description": "🄿 Kiddie Ride", "object_types": ["node"], "icon_url": "https://cdn.jsdelivr.net/gh/ideditor/temaki/icons/amusement_park.svg"},
     {"key": "attraction", "value": "log_flume", "description": "🄿 Log Flume", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/ferry-15.svg"},
     {"key": "attraction", "value": "maze", "description": "🄿 Maze", "object_types": ["node", "area"], "icon_url": "https://cdn.jsdelivr.net/gh/mapbox/maki/icons/amusement-park-15.svg"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 52a53b502..fc8685df5 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -5852,7 +5852,7 @@
                     "terms": "theme park,ghost train"
                 },
                 "attraction/drop_tower": {
-                    "name": "Drop Tower",
+                    "name": "Drop Tower Ride",
                     "terms": "theme park,amusement ride,gondola,tower,big drop"
                 },
                 "attraction/kiddie_ride": {
@@ -7103,7 +7103,7 @@
                 },
                 "landuse/forest": {
                     "name": "Managed Forest",
-                    "terms": "cut,forest,forestry,lumber,silviculture,tree,trees"
+                    "terms": "boreal,cut,forest,forestry,forrest,lumber,silviculture,taiga,tree,trees,woodlands,woods"
                 },
                 "landuse/garages": {
                     "name": "Garage Landuse",
@@ -7111,7 +7111,7 @@
                 },
                 "landuse/grass": {
                     "name": "Grass",
-                    "terms": ""
+                    "terms": "field,green,lawn,managed grass,mown grass,turf"
                 },
                 "landuse/greenfield": {
                     "name": "Greenfield",
@@ -7895,7 +7895,7 @@
                 },
                 "natural/grassland": {
                     "name": "Grassland",
-                    "terms": "prairie,savanna"
+                    "terms": "field,prairie,savanna"
                 },
                 "natural/heath": {
                     "name": "Heath",
@@ -8011,7 +8011,7 @@
                 },
                 "natural/wood": {
                     "name": "Natural Wood",
-                    "terms": "tree,trees"
+                    "terms": "boreal,forest,forrest,taiga,tree,trees,woodlands,woods"
                 },
                 "network/type/node_network": {
                     "name": "Recreational Network Node",