diff --git a/data/presets.yaml b/data/presets.yaml
index acffd3d61..28997a999 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -2483,6 +2483,11 @@ en:
         # building=barn
         name: Barn
         terms: '<translate with synonyms or related terms for ''Barn'', separated by commas>'
+      building/bungalow:
+        # building=bungalow
+        name: Bungalow
+        # 'terms: home,detached'
+        terms: '<translate with synonyms or related terms for ''Bungalow'', separated by commas>'
       building/bunker:
         # building=bunker
         name: Bunker
@@ -2502,6 +2507,10 @@ en:
         # building=church
         name: Church Building
         terms: '<translate with synonyms or related terms for ''Church Building'', separated by commas>'
+      building/civic:
+        # building=civic
+        name: Civic Building
+        terms: '<translate with synonyms or related terms for ''Civic Building'', separated by commas>'
       building/college:
         # building=college
         name: College Building
@@ -2527,6 +2536,10 @@ en:
       building/entrance:
         # building=entrance
         name: Entrance/Exit
+      building/farm:
+        # building=farm
+        name: Farm Building
+        terms: '<translate with synonyms or related terms for ''Farm Building'', separated by commas>'
       building/garage:
         # building=garage
         name: Garage
@@ -2585,6 +2598,10 @@ en:
         # building=roof
         name: Roof
         terms: '<translate with synonyms or related terms for ''Roof'', separated by commas>'
+      building/ruins:
+        # building=ruins
+        name: Building Ruins
+        terms: '<translate with synonyms or related terms for ''Building Ruins'', separated by commas>'
       building/school:
         # building=school
         name: School Building
@@ -2595,6 +2612,10 @@ en:
         name: Semi-Detached House
         # 'terms: home,double,duplex,twin,family,residence,dwelling'
         terms: '<translate with synonyms or related terms for ''Semi-Detached House'', separated by commas>'
+      building/service:
+        # building=service
+        name: Service Building
+        terms: '<translate with synonyms or related terms for ''Service Building'', separated by commas>'
       building/shed:
         # building=shed
         name: Shed
@@ -2603,10 +2624,18 @@ en:
         # building=stable
         name: Stable
         terms: '<translate with synonyms or related terms for ''Stable'', separated by commas>'
+      building/stadium:
+        # building=stadium
+        name: Stadium Building
+        terms: '<translate with synonyms or related terms for ''Stadium Building'', separated by commas>'
       building/static_caravan:
         # building=static_caravan
         name: Static Mobile Home
         terms: '<translate with synonyms or related terms for ''Static Mobile Home'', separated by commas>'
+      building/temple:
+        # building=temple
+        name: Temple Building
+        terms: '<translate with synonyms or related terms for ''Temple Building'', separated by commas>'
       building/terrace:
         # building=terrace
         name: Row Houses
@@ -2615,6 +2644,10 @@ en:
       building/train_station:
         # building=train_station
         name: Train Station
+      building/transportation:
+        # building=transportation
+        name: Transportation Building
+        terms: '<translate with synonyms or related terms for ''Transportation Building'', separated by commas>'
       building/university:
         # building=university
         name: University Building
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e8b445485..415fc8d7c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4247,6 +4247,26 @@
             "matchScore": 0.5,
             "name": "Barn"
         },
+        "building/bungalow": {
+            "icon": "home",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "bungalow"
+            },
+            "terms": [
+                "home",
+                "detached"
+            ],
+            "matchScore": 0.5,
+            "name": "Bungalow"
+        },
         "building/cabin": {
             "icon": "home",
             "fields": [
@@ -4311,6 +4331,23 @@
             "matchScore": 0.5,
             "name": "Church Building"
         },
+        "building/civic": {
+            "icon": "building",
+            "fields": [
+                "name",
+                "address",
+                "levels",
+                "smoking"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "civic"
+            },
+            "matchScore": 0.5,
+            "name": "Civic Building"
+        },
         "building/college": {
             "icon": "building",
             "fields": [
@@ -4403,6 +4440,22 @@
             "matchScore": 0.5,
             "name": "Dormitory"
         },
+        "building/farm": {
+            "icon": "farm",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "farm"
+            },
+            "matchScore": 0.5,
+            "name": "Farm Building"
+        },
         "building/garage": {
             "icon": "warehouse",
             "fields": [
@@ -4634,6 +4687,22 @@
             "matchScore": 0.5,
             "name": "Roof"
         },
+        "building/ruins": {
+            "icon": "poi-ruins",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "ruins"
+            },
+            "matchScore": 0.5,
+            "name": "Building Ruins"
+        },
         "building/school": {
             "icon": "building",
             "fields": [
@@ -4681,6 +4750,22 @@
             "matchScore": 0.5,
             "name": "Semi-Detached House"
         },
+        "building/service": {
+            "icon": "home",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "service"
+            },
+            "matchScore": 0.5,
+            "name": "Service Building"
+        },
         "building/shed": {
             "icon": "home",
             "fields": [
@@ -4713,6 +4798,23 @@
             "matchScore": 0.5,
             "name": "Stable"
         },
+        "building/stadium": {
+            "icon": "stadium",
+            "fields": [
+                "name",
+                "address",
+                "levels",
+                "smoking"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "stadium"
+            },
+            "matchScore": 0.5,
+            "name": "Stadium Building"
+        },
         "building/static_caravan": {
             "icon": "home",
             "fields": [
@@ -4729,6 +4831,22 @@
             "matchScore": 0.5,
             "name": "Static Mobile Home"
         },
+        "building/temple": {
+            "icon": "place-of-worship",
+            "fields": [
+                "name",
+                "address",
+                "levels"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "temple"
+            },
+            "matchScore": 0.5,
+            "name": "Temple Building"
+        },
         "building/terrace": {
             "icon": "building",
             "fields": [
@@ -4753,6 +4871,23 @@
             "matchScore": 0.5,
             "name": "Row Houses"
         },
+        "building/transportation": {
+            "icon": "building",
+            "fields": [
+                "name",
+                "address",
+                "levels",
+                "smoking"
+            ],
+            "geometry": [
+                "area"
+            ],
+            "tags": {
+                "building": "transportation"
+            },
+            "matchScore": 0.5,
+            "name": "Transportation Building"
+        },
         "building/university": {
             "icon": "building",
             "fields": [
diff --git a/data/presets/presets/building/bungalow.json b/data/presets/presets/building/bungalow.json
new file mode 100644
index 000000000..81e586d8d
--- /dev/null
+++ b/data/presets/presets/building/bungalow.json
@@ -0,0 +1,20 @@
+{
+    "icon": "home",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "bungalow"
+    },
+    "terms": [
+        "home",
+        "detached"
+    ],
+    "matchScore": 0.5,
+    "name": "Bungalow"
+}
diff --git a/data/presets/presets/building/civic.json b/data/presets/presets/building/civic.json
new file mode 100644
index 000000000..f5e4dc1a1
--- /dev/null
+++ b/data/presets/presets/building/civic.json
@@ -0,0 +1,17 @@
+{
+    "icon": "building",
+    "fields": [
+        "name",
+        "address",
+        "levels",
+        "smoking"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "civic"
+    },
+    "matchScore": 0.5,
+    "name": "Civic Building"
+}
diff --git a/data/presets/presets/building/farm.json b/data/presets/presets/building/farm.json
new file mode 100644
index 000000000..ac9366286
--- /dev/null
+++ b/data/presets/presets/building/farm.json
@@ -0,0 +1,16 @@
+{
+    "icon": "farm",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "farm"
+    },
+    "matchScore": 0.5,
+    "name": "Farm Building"
+}
diff --git a/data/presets/presets/building/ruins.json b/data/presets/presets/building/ruins.json
new file mode 100644
index 000000000..ab88c6944
--- /dev/null
+++ b/data/presets/presets/building/ruins.json
@@ -0,0 +1,16 @@
+{
+    "icon": "poi-ruins",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "ruins"
+    },
+    "matchScore": 0.5,
+    "name": "Building Ruins"
+}
diff --git a/data/presets/presets/building/service.json b/data/presets/presets/building/service.json
new file mode 100644
index 000000000..fc69060ae
--- /dev/null
+++ b/data/presets/presets/building/service.json
@@ -0,0 +1,16 @@
+{
+    "icon": "home",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "service"
+    },
+    "matchScore": 0.5,
+    "name": "Service Building"
+}
diff --git a/data/presets/presets/building/stadium.json b/data/presets/presets/building/stadium.json
new file mode 100644
index 000000000..b6a9fda2f
--- /dev/null
+++ b/data/presets/presets/building/stadium.json
@@ -0,0 +1,17 @@
+{
+    "icon": "stadium",
+    "fields": [
+        "name",
+        "address",
+        "levels",
+        "smoking"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "stadium"
+    },
+    "matchScore": 0.5,
+    "name": "Stadium Building"
+}
diff --git a/data/presets/presets/building/temple.json b/data/presets/presets/building/temple.json
new file mode 100644
index 000000000..534a59d47
--- /dev/null
+++ b/data/presets/presets/building/temple.json
@@ -0,0 +1,16 @@
+{
+    "icon": "place-of-worship",
+    "fields": [
+        "name",
+        "address",
+        "levels"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "temple"
+    },
+    "matchScore": 0.5,
+    "name": "Temple Building"
+}
diff --git a/data/presets/presets/building/transportation.json b/data/presets/presets/building/transportation.json
new file mode 100644
index 000000000..6465dfd60
--- /dev/null
+++ b/data/presets/presets/building/transportation.json
@@ -0,0 +1,17 @@
+{
+    "icon": "building",
+    "fields": [
+        "name",
+        "address",
+        "levels",
+        "smoking"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "building": "transportation"
+    },
+    "matchScore": 0.5,
+    "name": "Transportation Building"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 1ea45a244..d03317a08 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -788,6 +788,10 @@
             "key": "building",
             "value": "barn"
         },
+        {
+            "key": "building",
+            "value": "bungalow"
+        },
         {
             "key": "building",
             "value": "cabin"
@@ -804,6 +808,10 @@
             "key": "building",
             "value": "church"
         },
+        {
+            "key": "building",
+            "value": "civic"
+        },
         {
             "key": "building",
             "value": "college"
@@ -824,6 +832,10 @@
             "key": "building",
             "value": "dormitory"
         },
+        {
+            "key": "building",
+            "value": "farm"
+        },
         {
             "key": "building",
             "value": "garage"
@@ -880,6 +892,10 @@
             "key": "building",
             "value": "roof"
         },
+        {
+            "key": "building",
+            "value": "ruins"
+        },
         {
             "key": "building",
             "value": "school"
@@ -888,6 +904,10 @@
             "key": "building",
             "value": "semidetached_house"
         },
+        {
+            "key": "building",
+            "value": "service"
+        },
         {
             "key": "building",
             "value": "shed"
@@ -896,14 +916,26 @@
             "key": "building",
             "value": "stable"
         },
+        {
+            "key": "building",
+            "value": "stadium"
+        },
         {
             "key": "building",
             "value": "static_caravan"
         },
+        {
+            "key": "building",
+            "value": "temple"
+        },
         {
             "key": "building",
             "value": "terrace"
         },
+        {
+            "key": "building",
+            "value": "transportation"
+        },
         {
             "key": "building",
             "value": "university"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index e009184a1..7ed619a62 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3420,6 +3420,10 @@
                     "name": "Barn",
                     "terms": ""
                 },
+                "building/bungalow": {
+                    "name": "Bungalow",
+                    "terms": "home,detached"
+                },
                 "building/cabin": {
                     "name": "Cabin",
                     "terms": ""
@@ -3436,6 +3440,10 @@
                     "name": "Church Building",
                     "terms": ""
                 },
+                "building/civic": {
+                    "name": "Civic Building",
+                    "terms": ""
+                },
                 "building/college": {
                     "name": "College Building",
                     "terms": "university"
@@ -3456,6 +3464,10 @@
                     "name": "Dormitory",
                     "terms": ""
                 },
+                "building/farm": {
+                    "name": "Farm Building",
+                    "terms": ""
+                },
                 "building/garage": {
                     "name": "Garage",
                     "terms": ""
@@ -3512,6 +3524,10 @@
                     "name": "Roof",
                     "terms": ""
                 },
+                "building/ruins": {
+                    "name": "Building Ruins",
+                    "terms": ""
+                },
                 "building/school": {
                     "name": "School Building",
                     "terms": "academy,elementary school,middle school,high school"
@@ -3520,6 +3536,10 @@
                     "name": "Semi-Detached House",
                     "terms": "home,double,duplex,twin,family,residence,dwelling"
                 },
+                "building/service": {
+                    "name": "Service Building",
+                    "terms": ""
+                },
                 "building/shed": {
                     "name": "Shed",
                     "terms": ""
@@ -3528,14 +3548,26 @@
                     "name": "Stable",
                     "terms": ""
                 },
+                "building/stadium": {
+                    "name": "Stadium Building",
+                    "terms": ""
+                },
                 "building/static_caravan": {
                     "name": "Static Mobile Home",
                     "terms": ""
                 },
+                "building/temple": {
+                    "name": "Temple Building",
+                    "terms": ""
+                },
                 "building/terrace": {
                     "name": "Row Houses",
                     "terms": "home,terrace,brownstone,family,residence,dwelling"
                 },
+                "building/transportation": {
+                    "name": "Transportation Building",
+                    "terms": ""
+                },
                 "building/university": {
                     "name": "University Building",
                     "terms": "college"