diff --git a/data/presets.yaml b/data/presets.yaml
index 02106d08f..c280c74d2 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1724,6 +1724,10 @@ en:
         # amenity=parking_space
         name: Parking Space
         terms: '<translate with synonyms or related terms for ''Parking Space'', separated by commas>'
+      amenity/pavilion:
+        # 'amenity=shelter, shelter_type=pavilion, building=yes'
+        name: Pavilion
+        terms: '<translate with synonyms or related terms for ''Pavilion'', separated by commas>'
       amenity/pharmacy:
         # amenity=pharmacy
         name: Pharmacy
@@ -3513,7 +3517,6 @@ en:
       place/farm:
         # place=farm
         name: Farm
-        terms: '<translate with synonyms or related terms for ''Farm'', separated by commas>'
       place/hamlet:
         # place=hamlet
         name: Hamlet
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 167e6256b..2ac714f73 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1749,6 +1749,24 @@
             "terms": [],
             "name": "Car Parking"
         },
+        "amenity/pavilion": {
+            "icon": "shelter",
+            "fields": [
+                "bin",
+                "bench"
+            ],
+            "geometry": [
+                "point",
+                "vertex",
+                "area"
+            ],
+            "tags": {
+                "amenity": "shelter",
+                "shelter_type": "pavilion",
+                "building": "yes"
+            },
+            "name": "Pavilion"
+        },
         "amenity/pharmacy": {
             "icon": "pharmacy",
             "fields": [
@@ -9131,6 +9149,18 @@
             },
             "name": "Piste/Ski Trail"
         },
+        "place/farm": {
+            "icon": "farm",
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "place": "farm"
+            },
+            "name": "Farm",
+            "searchable": false
+        },
         "place/city": {
             "icon": "city",
             "fields": [
@@ -9145,17 +9175,6 @@
             },
             "name": "City"
         },
-        "place/farm": {
-            "icon": "farm",
-            "geometry": [
-                "point",
-                "area"
-            ],
-            "tags": {
-                "place": "farm"
-            },
-            "name": "Farm"
-        },
         "place/hamlet": {
             "icon": "triangle-stroked",
             "fields": [
diff --git a/data/presets/presets/amenity/pavilion.json b/data/presets/presets/amenity/pavilion.json
index 410bca082..6565194eb 100644
--- a/data/presets/presets/amenity/pavilion.json
+++ b/data/presets/presets/amenity/pavilion.json
@@ -11,8 +11,7 @@
     ],
     "tags": {
         "amenity": "shelter",
-	"shelter_type": "pavilion",
-	"building": "yes"
+	"shelter_type": "pavilion"
     },
     "name": "Pavilion"
 }
diff --git a/data/taginfo.json b/data/taginfo.json
index 60fa5a30d..3fe537687 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -371,6 +371,10 @@
             "key": "amenity",
             "value": "parking"
         },
+        {
+            "key": "building",
+            "value": "yes"
+        },
         {
             "key": "amenity",
             "value": "pharmacy"
@@ -1960,11 +1964,11 @@
         },
         {
             "key": "place",
-            "value": "city"
+            "value": "farm"
         },
         {
             "key": "place",
-            "value": "farm"
+            "value": "city"
         },
         {
             "key": "place",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 7bf594b96..50ce54370 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2253,6 +2253,10 @@
                     "name": "Car Parking",
                     "terms": ""
                 },
+                "amenity/pavilion": {
+                    "name": "Pavilion",
+                    "terms": ""
+                },
                 "amenity/pharmacy": {
                     "name": "Pharmacy",
                     "terms": "drug*,med*,prescription"
@@ -3857,14 +3861,14 @@
                     "name": "Piste/Ski Trail",
                     "terms": "ski,sled,sleigh,snowboard,nordic,downhill,snowmobile"
                 },
-                "place/city": {
-                    "name": "City",
-                    "terms": ""
-                },
                 "place/farm": {
                     "name": "Farm",
                     "terms": ""
                 },
+                "place/city": {
+                    "name": "City",
+                    "terms": ""
+                },
                 "place/hamlet": {
                     "name": "Hamlet",
                     "terms": ""