diff --git a/data/presets.yaml b/data/presets.yaml
index bcc2c8cce..84214ec5b 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -898,6 +898,9 @@ en:
       place:
         # place=*
         label: Type
+      plant:
+        # plant=*
+        label: Plant
       population:
         # population=*
         label: Population
@@ -2650,10 +2653,12 @@ en:
       landuse/farmland:
         # landuse=farmland
         name: Farmland
+        # 'terms: crop,grow,plant'
         terms: '<translate with synonyms or related terms for ''Farmland'', separated by commas>'
       landuse/farmyard:
         # landuse=farmyard
         name: Farmyard
+        # 'terms: crop,grow,plant'
         terms: '<translate with synonyms or related terms for ''Farmyard'', separated by commas>'
       landuse/forest:
         # landuse=forest
@@ -2688,11 +2693,12 @@ en:
       landuse/orchard:
         # landuse=orchard
         name: Orchard
+        # 'terms: fruit'
         terms: '<translate with synonyms or related terms for ''Orchard'', separated by commas>'
       landuse/plant_nursery:
         # landuse=plant_nursery
         name: Plant Nursery
-        # 'terms: vivero'
+        # 'terms: flower,garden,grow,vivero'
         terms: '<translate with synonyms or related terms for ''Plant Nursery'', separated by commas>'
       landuse/quarry:
         # landuse=quarry
@@ -2714,6 +2720,7 @@ en:
       landuse/vineyard:
         # landuse=vineyard
         name: Vineyard
+        # 'terms: grape,wine'
         terms: '<translate with synonyms or related terms for ''Vineyard'', separated by commas>'
       leisure:
         # leisure=*
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 59b74a898..85ae33ee7 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1183,6 +1183,11 @@
             "type": "typeCombo",
             "label": "Type"
         },
+        "plant": {
+            "key": "plant",
+            "type": "combo",
+            "label": "Plant"
+        },
         "population": {
             "key": "population",
             "type": "text",
diff --git a/data/presets/fields/plant.json b/data/presets/fields/plant.json
new file mode 100644
index 000000000..b79febe1d
--- /dev/null
+++ b/data/presets/fields/plant.json
@@ -0,0 +1,5 @@
+{
+    "key": "plant",
+    "type": "combo",
+    "label": "Plant"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 90182c2d8..9f83f18e8 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5790,6 +5790,7 @@
         "landuse/farm": {
             "icon": "farm",
             "fields": [
+                "operator",
                 "crop"
             ],
             "geometry": [
@@ -5883,6 +5884,7 @@
         "landuse/farmland": {
             "icon": "farm",
             "fields": [
+                "operator",
                 "crop"
             ],
             "geometry": [
@@ -5891,12 +5893,17 @@
             "tags": {
                 "landuse": "farmland"
             },
-            "terms": [],
+            "terms": [
+                "crop",
+                "grow",
+                "plant"
+            ],
             "name": "Farmland"
         },
         "landuse/farmyard": {
             "icon": "farm",
             "fields": [
+                "operator",
                 "crop"
             ],
             "geometry": [
@@ -5905,7 +5912,11 @@
             "tags": {
                 "landuse": "farmyard"
             },
-            "terms": [],
+            "terms": [
+                "crop",
+                "grow",
+                "plant"
+            ],
             "name": "Farmyard"
         },
         "landuse/forest": {
@@ -5992,6 +6003,7 @@
         "landuse/orchard": {
             "icon": "park2",
             "fields": [
+                "operator",
                 "trees"
             ],
             "geometry": [
@@ -6000,22 +6012,27 @@
             "tags": {
                 "landuse": "orchard"
             },
-            "terms": [],
+            "terms": [
+                "fruit"
+            ],
             "name": "Orchard"
         },
         "landuse/plant_nursery": {
             "icon": "garden",
             "fields": [
-                "name"
+                "operator",
+                "plant"
             ],
             "geometry": [
-                "point",
                 "area"
             ],
             "tags": {
                 "landuse": "plant_nursery"
             },
             "terms": [
+                "flower",
+                "garden",
+                "grow",
                 "vivero"
             ],
             "name": "Plant Nursery"
@@ -6064,13 +6081,19 @@
             "name": "Retail Area"
         },
         "landuse/vineyard": {
+            "fields": [
+                "operator"
+            ],
             "geometry": [
                 "area"
             ],
             "tags": {
                 "landuse": "vineyard"
             },
-            "terms": [],
+            "terms": [
+                "grape",
+                "wine"
+            ],
             "name": "Vineyard"
         },
         "leisure": {
diff --git a/data/presets/presets/landuse/_farm.json b/data/presets/presets/landuse/_farm.json
index 96e63edfc..a601e5653 100644
--- a/data/presets/presets/landuse/_farm.json
+++ b/data/presets/presets/landuse/_farm.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "operator",
         "crop"
     ],
     "geometry": [
diff --git a/data/presets/presets/landuse/farmland.json b/data/presets/presets/landuse/farmland.json
index 6c13c415f..14a1dcc8b 100644
--- a/data/presets/presets/landuse/farmland.json
+++ b/data/presets/presets/landuse/farmland.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "operator",
         "crop"
     ],
     "geometry": [
@@ -9,6 +10,10 @@
     "tags": {
         "landuse": "farmland"
     },
-    "terms": [],
+    "terms": [
+        "crop",
+        "grow",
+        "plant"
+    ],
     "name": "Farmland"
 }
diff --git a/data/presets/presets/landuse/farmyard.json b/data/presets/presets/landuse/farmyard.json
index 5b2b4b714..ea885b9a1 100644
--- a/data/presets/presets/landuse/farmyard.json
+++ b/data/presets/presets/landuse/farmyard.json
@@ -1,6 +1,7 @@
 {
     "icon": "farm",
     "fields": [
+        "operator",
         "crop"
     ],
     "geometry": [
@@ -9,6 +10,10 @@
     "tags": {
         "landuse": "farmyard"
     },
-    "terms": [],
+    "terms": [
+        "crop",
+        "grow",
+        "plant"
+    ],
     "name": "Farmyard"
 }
diff --git a/data/presets/presets/landuse/orchard.json b/data/presets/presets/landuse/orchard.json
index e2f15af79..35607bfb1 100644
--- a/data/presets/presets/landuse/orchard.json
+++ b/data/presets/presets/landuse/orchard.json
@@ -1,6 +1,7 @@
 {
     "icon": "park2",
     "fields": [
+        "operator",
         "trees"
     ],
     "geometry": [
@@ -9,6 +10,8 @@
     "tags": {
         "landuse": "orchard"
     },
-    "terms": [],
+    "terms": [
+        "fruit"
+    ],
     "name": "Orchard"
 }
diff --git a/data/presets/presets/landuse/plant_nursery.json b/data/presets/presets/landuse/plant_nursery.json
index 48d650067..5876ccace 100644
--- a/data/presets/presets/landuse/plant_nursery.json
+++ b/data/presets/presets/landuse/plant_nursery.json
@@ -1,16 +1,19 @@
 {
     "icon": "garden",
     "fields": [
-        "name"
+        "operator",
+        "plant"
     ],
     "geometry": [
-        "point",
         "area"
     ],
     "tags": {
         "landuse": "plant_nursery"
     },
     "terms": [
+        "flower",
+        "garden",
+        "grow",
         "vivero"
     ],
     "name": "Plant Nursery"
diff --git a/data/presets/presets/landuse/vineyard.json b/data/presets/presets/landuse/vineyard.json
index 47bdef728..9cf92713d 100644
--- a/data/presets/presets/landuse/vineyard.json
+++ b/data/presets/presets/landuse/vineyard.json
@@ -1,10 +1,16 @@
 {
+    "fields": [
+        "operator"
+    ],
     "geometry": [
         "area"
     ],
     "tags": {
         "landuse": "vineyard"
     },
-    "terms": [],
+    "terms": [
+        "grape",
+        "wine"
+    ],
     "name": "Vineyard"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b50995a57..cf1183103 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1468,6 +1468,9 @@
                 "place": {
                     "label": "Type"
                 },
+                "plant": {
+                    "label": "Plant"
+                },
                 "population": {
                     "label": "Population"
                 },
@@ -3064,11 +3067,11 @@
                 },
                 "landuse/farmland": {
                     "name": "Farmland",
-                    "terms": ""
+                    "terms": "crop,grow,plant"
                 },
                 "landuse/farmyard": {
                     "name": "Farmyard",
-                    "terms": ""
+                    "terms": "crop,grow,plant"
                 },
                 "landuse/forest": {
                     "name": "Forest",
@@ -3100,11 +3103,11 @@
                 },
                 "landuse/orchard": {
                     "name": "Orchard",
-                    "terms": ""
+                    "terms": "fruit"
                 },
                 "landuse/plant_nursery": {
                     "name": "Plant Nursery",
-                    "terms": "vivero"
+                    "terms": "flower,garden,grow,vivero"
                 },
                 "landuse/quarry": {
                     "name": "Quarry",
@@ -3124,7 +3127,7 @@
                 },
                 "landuse/vineyard": {
                     "name": "Vineyard",
-                    "terms": ""
+                    "terms": "grape,wine"
                 },
                 "leisure": {
                     "name": "Leisure",