diff --git a/data/presets.yaml b/data/presets.yaml
index 2b56ff912..aa1b17b88 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1541,7 +1541,7 @@ en:
         name: Courthouse
         terms: '<translate with synonyms or related terms for ''Courthouse'', separated by commas>'
       amenity/coworking_space:
-        # office=coworking
+        # amenity=coworking_space
         name: Coworking Space
       amenity/crematorium:
         # amenity=crematorium
@@ -1611,7 +1611,7 @@ en:
       amenity/hospital:
         # amenity=hospital
         name: Hospital Grounds
-        # 'terms: clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward'
+        # 'terms: clinic,doctor,emergency room,health,infirmary,institution,sanatorium,sanitarium,sick,surgery,ward'
         terms: '<translate with synonyms or related terms for ''Hospital Grounds'', separated by commas>'
       amenity/hunting_stand:
         # amenity=hunting_stand
@@ -1651,6 +1651,9 @@ en:
         name: Nightclub
         # 'terms: disco*,night club,dancing,dance club'
         terms: '<translate with synonyms or related terms for ''Nightclub'', separated by commas>'
+      amenity/nursing_home:
+        # amenity=nursing_home
+        name: Nursing Home
       amenity/parking:
         # amenity=parking
         name: Car Parking
@@ -1789,6 +1792,11 @@ en:
         name: Homeless Shelter
         # 'terms: houseless,unhoused,displaced'
         terms: '<translate with synonyms or related terms for ''Homeless Shelter'', separated by commas>'
+      amenity/social_facility/nursing_home:
+        # 'amenity=social_facility, social_facility=nursing_home, social_facility:for=senior'
+        name: Nursing Home
+        # 'terms: elderly,living,nursing,old,senior'
+        terms: '<translate with synonyms or related terms for ''Nursing Home'', separated by commas>'
       amenity/studio:
         # amenity=studio
         name: Studio
diff --git a/data/presets/presets.json b/data/presets/presets.json
index e79463249..3c043a244 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -507,11 +507,32 @@
                 "area"
             ],
             "tags": {
-                "office": "coworking"
+                "amenity": "coworking_space"
             },
             "name": "Coworking Space",
             "searchable": false
         },
+        "amenity/nursing_home": {
+            "icon": "wheelchair",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "social_facility",
+                "social_facility_for",
+                "opening_hours",
+                "wheelchair"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "tags": {
+                "amenity": "nursing_home"
+            },
+            "name": "Nursing Home",
+            "searchable": false
+        },
         "amenity/register_office": {
             "icon": "town-hall",
             "fields": [
@@ -524,7 +545,6 @@
                 "point",
                 "area"
             ],
-            "terms": [],
             "tags": {
                 "amenity": "register_office"
             },
@@ -1365,11 +1385,9 @@
                 "clinic",
                 "doctor",
                 "emergency room",
-                "health service",
-                "hospice",
+                "health",
                 "infirmary",
                 "institution",
-                "nursing home",
                 "sanatorium",
                 "sanitarium",
                 "sick",
@@ -2245,6 +2263,35 @@
             },
             "name": "Homeless Shelter"
         },
+        "amenity/social_facility/nursing_home": {
+            "icon": "wheelchair",
+            "fields": [
+                "operator",
+                "address",
+                "building_area",
+                "social_facility",
+                "social_facility_for",
+                "opening_hours",
+                "wheelchair"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "elderly",
+                "living",
+                "nursing",
+                "old",
+                "senior"
+            ],
+            "tags": {
+                "amenity": "social_facility",
+                "social_facility": "nursing_home",
+                "social_facility:for": "senior"
+            },
+            "name": "Nursing Home"
+        },
         "amenity/studio": {
             "icon": "karaoke",
             "fields": [
diff --git a/data/presets/presets/amenity/_coworking_space.json b/data/presets/presets/amenity/_coworking_space.json
index 876080d71..41a7006ff 100644
--- a/data/presets/presets/amenity/_coworking_space.json
+++ b/data/presets/presets/amenity/_coworking_space.json
@@ -13,7 +13,7 @@
         "area"
     ],
     "tags": {
-        "office": "coworking"
+        "amenity": "coworking_space"
     },
     "name": "Coworking Space",
     "searchable": false
diff --git a/data/presets/presets/amenity/_nursing_home.json b/data/presets/presets/amenity/_nursing_home.json
new file mode 100644
index 000000000..31240698e
--- /dev/null
+++ b/data/presets/presets/amenity/_nursing_home.json
@@ -0,0 +1,21 @@
+{
+    "icon": "wheelchair",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "social_facility",
+        "social_facility_for",
+        "opening_hours",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "tags": {
+        "amenity": "nursing_home"
+    },
+    "name": "Nursing Home",
+    "searchable": false
+}
diff --git a/data/presets/presets/amenity/_register_office.json b/data/presets/presets/amenity/_register_office.json
index 0efdd7c0c..8cded976f 100644
--- a/data/presets/presets/amenity/_register_office.json
+++ b/data/presets/presets/amenity/_register_office.json
@@ -10,8 +10,6 @@
         "point",
         "area"
     ],
-    "terms": [
-    ],
     "tags": {
         "amenity": "register_office"
     },
diff --git a/data/presets/presets/amenity/hospital.json b/data/presets/presets/amenity/hospital.json
index 87a2d0ba1..998a5b0cb 100644
--- a/data/presets/presets/amenity/hospital.json
+++ b/data/presets/presets/amenity/hospital.json
@@ -13,11 +13,9 @@
         "clinic",
         "doctor",
         "emergency room",
-        "health service",
-        "hospice",
+        "health",
         "infirmary",
         "institution",
-        "nursing home",
         "sanatorium",
         "sanitarium",
         "sick",
diff --git a/data/presets/presets/amenity/social_facility/nursing_home.json b/data/presets/presets/amenity/social_facility/nursing_home.json
new file mode 100644
index 000000000..723d24af9
--- /dev/null
+++ b/data/presets/presets/amenity/social_facility/nursing_home.json
@@ -0,0 +1,29 @@
+{
+    "icon": "wheelchair",
+    "fields": [
+        "operator",
+        "address",
+        "building_area",
+        "social_facility",
+        "social_facility_for",
+        "opening_hours",
+        "wheelchair"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "elderly",
+        "living",
+        "nursing",
+        "old",
+        "senior"
+    ],
+    "tags": {
+        "amenity": "social_facility",
+        "social_facility": "nursing_home",
+        "social_facility:for": "senior"
+    },
+    "name": "Nursing Home"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 7a4aa781a..3ac19b3ec 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -128,8 +128,12 @@
             "value": "terminal"
         },
         {
-            "key": "office",
-            "value": "coworking"
+            "key": "amenity",
+            "value": "coworking_space"
+        },
+        {
+            "key": "amenity",
+            "value": "nursing_home"
         },
         {
             "key": "amenity",
@@ -451,6 +455,10 @@
             "key": "social_facility:for",
             "value": "homeless"
         },
+        {
+            "key": "social_facility:for",
+            "value": "senior"
+        },
         {
             "key": "amenity",
             "value": "studio"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 962b70d12..52fe9bcc0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1956,6 +1956,10 @@
                     "name": "Coworking Space",
                     "terms": ""
                 },
+                "amenity/nursing_home": {
+                    "name": "Nursing Home",
+                    "terms": ""
+                },
                 "amenity/register_office": {
                     "name": "Register Office",
                     "terms": ""
@@ -2130,7 +2134,7 @@
                 },
                 "amenity/hospital": {
                     "name": "Hospital Grounds",
-                    "terms": "clinic,doctor,emergency room,health service,hospice,infirmary,institution,nursing home,sanatorium,sanitarium,sick,surgery,ward"
+                    "terms": "clinic,doctor,emergency room,health,infirmary,institution,sanatorium,sanitarium,sick,surgery,ward"
                 },
                 "amenity/hunting_stand": {
                     "name": "Hunting Stand",
@@ -2276,6 +2280,10 @@
                     "name": "Homeless Shelter",
                     "terms": "houseless,unhoused,displaced"
                 },
+                "amenity/social_facility/nursing_home": {
+                    "name": "Nursing Home",
+                    "terms": "elderly,living,nursing,old,senior"
+                },
                 "amenity/studio": {
                     "name": "Studio",
                     "terms": "recording,radio,television"