diff --git a/data/deprecated.json b/data/deprecated.json
index 097b11dc1..6c75e1e98 100644
--- a/data/deprecated.json
+++ b/data/deprecated.json
@@ -710,14 +710,18 @@
     "old": {"healthcare": "birthing_center"},
     "replace": {"healthcare": "birthing_centre"}
   },
+  {
+    "old": {"healthcare:speciality": "internist"},
+    "replace": {"healthcare:speciality": "internal"}
+  },
   {
     "old": {"highway": "abandoned"},
     "replace": {"abandoned:highway": "*"}
   },
-	{
-		"old": {"highway": "service", "service": "busway"},
-		"replace": {"highway": "busway"}
-	},
+  {
+    "old": {"highway": "service", "service": "busway"},
+    "replace": {"highway": "busway"}
+  },
   {
     "old": {"highway": "bridleway", "horse": "no"},
     "replace": {"highway": "path", "horse": "no"}
diff --git a/data/presets/amenity/doctors/allergology.json b/data/presets/amenity/doctors/allergology.json
new file mode 100644
index 000000000..538e521d1
--- /dev/null
+++ b/data/presets/amenity/doctors/allergology.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "allergy",
+        "asthma"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "allergology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "allergology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "allergology"
+    },
+    "name": "Allergologist"
+}
diff --git a/data/presets/amenity/doctors/cardiology.json b/data/presets/amenity/doctors/cardiology.json
new file mode 100644
index 000000000..a644403a4
--- /dev/null
+++ b/data/presets/amenity/doctors/cardiology.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cardiac surgeon",
+        "Cardiology",
+        "cardiovascular system",
+        "coronary artery",
+        "heart"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "cardiology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "cardiology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "cardiology"
+    },
+    "name": "Cardiologist"
+}
diff --git a/data/presets/amenity/doctors/dermatology.json b/data/presets/amenity/doctors/dermatology.json
new file mode 100644
index 000000000..b45ed396a
--- /dev/null
+++ b/data/presets/amenity/doctors/dermatology.json
@@ -0,0 +1,27 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "dermatology",
+        "hair",
+        "nails",
+        "skin"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "dermatology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "dermatology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "dermatology"
+    },
+    "name": "Dermatologist"
+}
diff --git a/data/presets/amenity/doctors/gastroenterology.json b/data/presets/amenity/doctors/gastroenterology.json
new file mode 100644
index 000000000..b1dea4816
--- /dev/null
+++ b/data/presets/amenity/doctors/gastroenterology.json
@@ -0,0 +1,38 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "bowels",
+        "digestive system",
+        "digestion",
+        "esophagus",
+        "food pipe",
+        "gallstone",
+        "gastrointestinal tract",
+        "gastroenterology",
+        "gullet",
+        "intestines",
+        "large intestine",
+        "liver",
+        "oesophagus",
+        "small intestine",
+        "stomach"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "gastroenterology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "gastroenterology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "gastroenterology"
+    },
+    "name": "Gastroenterologist"
+}
diff --git a/data/presets/amenity/doctors/general.json b/data/presets/amenity/doctors/general.json
new file mode 100644
index 000000000..bbb68b393
--- /dev/null
+++ b/data/presets/amenity/doctors/general.json
@@ -0,0 +1,30 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "gp",
+        "family physician",
+        "family practitioner",
+        "family doctor"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "general"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "general",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "general"
+    },
+    "name": "Primary Care Physician",
+    "aliases": [
+        "General Practitioner"
+    ]
+}
diff --git a/data/presets/amenity/doctors/gynaecology.json b/data/presets/amenity/doctors/gynaecology.json
index 1049233d0..1d1865b5d 100644
--- a/data/presets/amenity/doctors/gynaecology.json
+++ b/data/presets/amenity/doctors/gynaecology.json
@@ -17,9 +17,13 @@
     ],
     "tags": {
         "amenity": "doctors",
-        "healthcare": "doctor",
         "healthcare:speciality": "gynaecology"
     },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "gynaecology",
+        "healthcare": "doctor"
+    },
     "reference": {
         "key": "healthcare:speciality",
         "value": "gynaecology"
diff --git a/data/presets/amenity/doctors/haematology.json b/data/presets/amenity/doctors/haematology.json
new file mode 100644
index 000000000..ddae8d8b4
--- /dev/null
+++ b/data/presets/amenity/doctors/haematology.json
@@ -0,0 +1,32 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "anemia",
+        "blood",
+        "bone marrow",
+        "haematology",
+        "leukemia",
+        "lymphoma"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "haematology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "haematology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "haematology"
+    },
+    "name": "Hematologist",
+    "aliases": [
+        "Haematologist"
+    ]
+}
diff --git a/data/presets/amenity/doctors/internal.json b/data/presets/amenity/doctors/internal.json
new file mode 100644
index 000000000..055117f05
--- /dev/null
+++ b/data/presets/amenity/doctors/internal.json
@@ -0,0 +1,27 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "internal general practitioner",
+        "internal medicine",
+        "internist",
+        "physician"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "internal"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "internal",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "internal"
+    },
+    "name": "Internist"
+}
diff --git a/data/presets/amenity/doctors/nephrology.json b/data/presets/amenity/doctors/nephrology.json
new file mode 100644
index 000000000..07b4c2745
--- /dev/null
+++ b/data/presets/amenity/doctors/nephrology.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "kidney",
+        "kidneys",
+        "kidney medicine",
+        "nephrology",
+        "renal"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "nephrology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "nephrology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "nephrology"
+    },
+    "name": "Nephrologist"
+}
diff --git a/data/presets/amenity/doctors/neurology.json b/data/presets/amenity/doctors/neurology.json
new file mode 100644
index 000000000..1504ea5d5
--- /dev/null
+++ b/data/presets/amenity/doctors/neurology.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "brain",
+        "nerves",
+        "nervous system",
+        "neurology",
+        "neurosurgery"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "neurology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "neurology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "neurology"
+    },
+    "name": "Neurologist"
+}
diff --git a/data/presets/amenity/doctors/neurosurgery.json b/data/presets/amenity/doctors/neurosurgery.json
new file mode 100644
index 000000000..f4bc22ffc
--- /dev/null
+++ b/data/presets/amenity/doctors/neurosurgery.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "brain",
+        "neurological surgery"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "neurosurgery"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "neurosurgery",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "neurosurgery"
+    },
+    "name": "Neurosurgeon",
+    "aliases": [
+        "Brain Surgeon"
+    ]
+}
diff --git a/data/presets/amenity/doctors/oncology.json b/data/presets/amenity/doctors/oncology.json
new file mode 100644
index 000000000..7671329ec
--- /dev/null
+++ b/data/presets/amenity/doctors/oncology.json
@@ -0,0 +1,27 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "cancer",
+        "chemotherapy",
+        "oncology",
+        "tumor"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "oncology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "oncology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "oncology"
+    },
+    "name": "Oncologist"
+}
diff --git a/data/presets/amenity/doctors/ophthalmology.json b/data/presets/amenity/doctors/ophthalmology.json
new file mode 100644
index 000000000..72f5447d8
--- /dev/null
+++ b/data/presets/amenity/doctors/ophthalmology.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "eye",
+        "eyes",
+        "glasses",
+        "ocular",
+        "ophthalmology"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "ophthalmology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "ophthalmology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "ophthalmology"
+    },
+    "name": "Ophthalmologist"
+}
diff --git a/data/presets/amenity/doctors/orthopaedics.json b/data/presets/amenity/doctors/orthopaedics.json
new file mode 100644
index 000000000..edae863b8
--- /dev/null
+++ b/data/presets/amenity/doctors/orthopaedics.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "orthopedic surgery"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "orthopaedics"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "orthopaedics",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "orthopaedics"
+    },
+    "name": "Orthopedic Surgeon",
+    "aliases": [
+        "Orthopedics",
+        "Orthopaedics"
+    ]
+}
diff --git a/data/presets/amenity/doctors/otolaryngology.json b/data/presets/amenity/doctors/otolaryngology.json
new file mode 100644
index 000000000..7b5abfc41
--- /dev/null
+++ b/data/presets/amenity/doctors/otolaryngology.json
@@ -0,0 +1,37 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "ear",
+        "ent",
+        "head and neck surgery",
+        "nose",
+        "ohns",
+        "orl",
+        "orl–h&n",
+        "otolaryngologist",
+        "otorhinolaryngology",
+        "skull",
+        "throat"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "otolaryngology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "otolaryngology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "otolaryngology"
+    },
+    "name": "Otolaryngologist",
+    "aliases": [
+        "Otorhinolaryngologist"
+    ]
+}
diff --git a/data/presets/amenity/doctors/paediatrics.json b/data/presets/amenity/doctors/paediatrics.json
new file mode 100644
index 000000000..5940069ac
--- /dev/null
+++ b/data/presets/amenity/doctors/paediatrics.json
@@ -0,0 +1,30 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "adolescents",
+        "children",
+        "infants",
+        "paediatrics"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "paediatrics"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "paediatrics",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "paediatrics"
+    },
+    "name": "Pediatrician",
+    "aliases": [
+        "Paediatrician"
+    ]
+}
diff --git a/data/presets/amenity/doctors/pathology.json b/data/presets/amenity/doctors/pathology.json
new file mode 100644
index 000000000..feab34763
--- /dev/null
+++ b/data/presets/amenity/doctors/pathology.json
@@ -0,0 +1,27 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "autopsy",
+        "anatomical pathology",
+        "anatomic pathology",
+        "pathology"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "pathology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "pathology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "pathology"
+    },
+    "name": "Pathologist"
+}
diff --git a/data/presets/amenity/doctors/plastic_surgery.json b/data/presets/amenity/doctors/plastic_surgery.json
new file mode 100644
index 000000000..c561fc91e
--- /dev/null
+++ b/data/presets/amenity/doctors/plastic_surgery.json
@@ -0,0 +1,28 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "aesthetic surgery",
+        "cosmetic surgery",
+        "craniofacial surgery",
+        "reconstructive surgery",
+        "plastic surgery"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "plastic_surgery"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "plastic_surgery",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "plastic_surgery"
+    },
+    "name": "Plastic Surgeon"
+}
diff --git a/data/presets/amenity/doctors/podiatry.json b/data/presets/amenity/doctors/podiatry.json
new file mode 100644
index 000000000..50b502137
--- /dev/null
+++ b/data/presets/amenity/doctors/podiatry.json
@@ -0,0 +1,33 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "ankle",
+        "feet",
+        "foot",
+        "leg",
+        "legs",
+        "podiatry"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "podiatry"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "podiatry",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "podiatry"
+    },
+    "name": "Podiatrist",
+    "aliases": [
+        "Chiropodist",
+        "Podiatric Surgeon"
+    ]
+}
diff --git a/data/presets/amenity/doctors/proctology.json b/data/presets/amenity/doctors/proctology.json
new file mode 100644
index 000000000..b45604544
--- /dev/null
+++ b/data/presets/amenity/doctors/proctology.json
@@ -0,0 +1,29 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "assman",
+        "colorectal surgery",
+        "proctology"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "proctology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "proctology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "proctology"
+    },
+    "name": "Colorectal Surgeon",
+    "aliases": [
+        "Proctologist"
+    ]
+}
diff --git a/data/presets/amenity/doctors/pulmonology.json b/data/presets/amenity/doctors/pulmonology.json
new file mode 100644
index 000000000..84a76ada3
--- /dev/null
+++ b/data/presets/amenity/doctors/pulmonology.json
@@ -0,0 +1,38 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "asthma",
+        "chest medicine",
+        "lung",
+        "pneumology",
+        "pneumonology",
+        "pneumonia",
+        "pulmonology",
+        "respiratory tract",
+        "respirology",
+        "respiratory medicine"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "pulmonology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "pulmonology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "pulmonology"
+    },
+    "name": "Pulmonologist",
+    "aliases": [
+        "Pneumologist",
+        "Respiratory Physician",
+        "Respirologist"
+    ]
+}
diff --git a/data/presets/amenity/doctors/radiology.json b/data/presets/amenity/doctors/radiology.json
new file mode 100644
index 000000000..efe88e155
--- /dev/null
+++ b/data/presets/amenity/doctors/radiology.json
@@ -0,0 +1,35 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "radiology",
+        "computed tomography",
+        "ct",
+        "magnetic resonance imaging",
+        "medical ultrasound",
+        "medical ultrasonography",
+        "mri",
+        "sonography",
+        "ultrasonography"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "radiology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "radiology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "radiology"
+    },
+    "name": "Radiologist",
+    "aliases": [
+        "Rontegenologist"
+    ]
+}
diff --git a/data/presets/amenity/doctors/rheumatology.json b/data/presets/amenity/doctors/rheumatology.json
new file mode 100644
index 000000000..2f8fb7336
--- /dev/null
+++ b/data/presets/amenity/doctors/rheumatology.json
@@ -0,0 +1,27 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "lupus",
+        "oteoporosis",
+        "rheuma",
+        "rheumatology"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "rheumatology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "rheumatology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "rheumatology"
+    },
+    "name": "Rheumatologist"
+}
diff --git a/data/presets/amenity/doctors/surgery.json b/data/presets/amenity/doctors/surgery.json
new file mode 100644
index 000000000..24b2ebd55
--- /dev/null
+++ b/data/presets/amenity/doctors/surgery.json
@@ -0,0 +1,24 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "surgery"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "surgery"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "surgery",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "surgery"
+    },
+    "name": "General Surgeon"
+}
diff --git a/data/presets/amenity/doctors/trauma.json b/data/presets/amenity/doctors/trauma.json
new file mode 100644
index 000000000..35449867a
--- /dev/null
+++ b/data/presets/amenity/doctors/trauma.json
@@ -0,0 +1,25 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "surgery",
+        "trauma surgery"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "trauma"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "trauma",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "trauma"
+    },
+    "name": "Trauma Surgeon"
+}
diff --git a/data/presets/amenity/doctors/urology.json b/data/presets/amenity/doctors/urology.json
new file mode 100644
index 000000000..40380ad97
--- /dev/null
+++ b/data/presets/amenity/doctors/urology.json
@@ -0,0 +1,37 @@
+{
+    "icon": "maki-doctor",
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "adrenal glands",
+        "bladder",
+        "epididymis",
+        "kidney",
+        "penis",
+        "prostate",
+        "reproductive",
+        "scrotum",
+        "testicles",
+        "testis",
+        "urethra",
+        "ureters",
+        "urology",
+        "urinary"
+    ],
+    "tags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "urology"
+    },
+    "addTags": {
+        "amenity": "doctors",
+        "healthcare:speciality": "urology",
+        "healthcare": "doctor"
+    },
+    "reference": {
+        "key": "healthcare:speciality",
+        "value": "urology"
+    },
+    "name": "Urologist"
+}
diff --git a/data/presets/amenity/social_facility/group_home.json b/data/presets/amenity/social_facility/group_home.json
index ae16ca82c..9926f46f6 100644
--- a/data/presets/amenity/social_facility/group_home.json
+++ b/data/presets/amenity/social_facility/group_home.json
@@ -9,11 +9,12 @@
         "area"
     ],
     "terms": [
-        "old",
-        "senior",
-        "living",
+        "assisted living",
         "care home",
-        "assisted living"
+        "elderly",
+        "living",
+        "old",
+        "senior"
     ],
     "tags": {
         "amenity": "social_facility",
@@ -24,5 +25,5 @@
         "key": "social_facility",
         "value": "group_home"
     },
-    "name": "Elderly Group Home"
+    "name": "Group Home"
 }
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index b690b8b20..e613a038a 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -4973,11 +4973,136 @@ en:
         name: Doctor
         # 'terms: medic,medical doctor,physician'
         terms: <translate with synonyms or related terms for 'Doctor', separated by commas>
+      amenity/doctors/allergology:
+        # amenity=doctors + healthcare:speciality=allergology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Allergologist
+        # 'terms: allergy,asthma'
+        terms: <translate with synonyms or related terms for 'Allergologist', separated by commas>
+      amenity/doctors/cardiology:
+        # amenity=doctors + healthcare:speciality=cardiology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Cardiologist
+        # 'terms: cardiac surgeon,cardiology,cardiovascular system,coronary artery,heart'
+        terms: <translate with synonyms or related terms for 'Cardiologist', separated by commas>
+      amenity/doctors/dermatology:
+        # amenity=doctors + healthcare:speciality=dermatology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Dermatologist
+        # 'terms: dermatology,hair,nails,skin'
+        terms: <translate with synonyms or related terms for 'Dermatologist', separated by commas>
+      amenity/doctors/gastroenterology:
+        # amenity=doctors + healthcare:speciality=gastroenterology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Gastroenterologist
+        # 'terms: bowels,digestive system,digestion,esophagus,food pipe,gallstone,gastrointestinal tract,gastroenterology,gullet,intestines,large intestine,liver,oesophagus,small intestine,stomach'
+        terms: <translate with synonyms or related terms for 'Gastroenterologist', separated by commas>
+      amenity/doctors/general:
+        # amenity=doctors + healthcare:speciality=general | General Practitioner | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Primary Care Physician
+        # 'terms: gp,family physician,family practitioner,family doctor'
+        terms: <translate with synonyms or related terms for 'Primary Care Physician', separated by commas>
       amenity/doctors/gynaecology:
-        # amenity=doctors + healthcare=doctor + healthcare:speciality=gynaecology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        # amenity=doctors + healthcare:speciality=gynaecology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Gynecologist
         # 'terms: egg,gynaecologist,gynaecology,gynecology,obstetrics,ovulation,reproductive,woman''s doctor,women''s doctor'
         terms: <translate with synonyms or related terms for 'Gynecologist', separated by commas>
+      amenity/doctors/haematology:
+        # amenity=doctors + healthcare:speciality=haematology | Haematologist | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Hematologist
+        # 'terms: anemia,blood,bone marrow,haematology,leukemia,lymphoma'
+        terms: <translate with synonyms or related terms for 'Hematologist', separated by commas>
+      amenity/doctors/internal:
+        # amenity=doctors + healthcare:speciality=internal | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Internist
+        # 'terms: internal general practitioner,internal medicine,physician'
+        terms: <translate with synonyms or related terms for 'Internist', separated by commas>
+      amenity/doctors/nephrology:
+        # amenity=doctors + healthcare:speciality=nephrology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Nephrologist
+        # 'terms: kidney,kidneys,kidney medicine,nephrology,renal'
+        terms: <translate with synonyms or related terms for 'Nephrologist', separated by commas>
+      amenity/doctors/neurology:
+        # amenity=doctors + healthcare:speciality=neurology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Neurologist
+        # 'terms: brain,nerves,nervous system,neurology,neurosurgery'
+        terms: <translate with synonyms or related terms for 'Neurologist', separated by commas>
+      amenity/doctors/neurosurgery:
+        # amenity=doctors + healthcare:speciality=neurosurgery | Brain Surgeon | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Neurosurgeon
+        # 'terms: brain,neurological surgery'
+        terms: <translate with synonyms or related terms for 'Neurosurgeon', separated by commas>
+      amenity/doctors/oncology:
+        # amenity=doctors + healthcare:speciality=oncology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Oncologist
+        # 'terms: cancer,chemotherapy,oncology,tumor'
+        terms: <translate with synonyms or related terms for 'Oncologist', separated by commas>
+      amenity/doctors/ophthalmology:
+        # amenity=doctors + healthcare:speciality=ophthalmology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Ophthalmologist
+        # 'terms: eye,eyes,glasses,ocular,ophthalmology'
+        terms: <translate with synonyms or related terms for 'Ophthalmologist', separated by commas>
+      amenity/doctors/orthopaedics:
+        # amenity=doctors + healthcare:speciality=orthopaedics | Orthopedics, Orthopaedics | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Orthopedic Surgeon
+        # 'terms: orthopedic surgery'
+        terms: <translate with synonyms or related terms for 'Orthopedic Surgeon', separated by commas>
+      amenity/doctors/otolaryngology:
+        # amenity=doctors + healthcare:speciality=otolaryngology | Otorhinolaryngologist | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Otolaryngologist
+        # 'terms: ear,ent,head and neck surgery,nose,ohns,orl,orl–h&n,otorhinolaryngology,skull,throat'
+        terms: <translate with synonyms or related terms for 'Otolaryngologist', separated by commas>
+      amenity/doctors/paediatrics:
+        # amenity=doctors + healthcare:speciality=paediatrics | Paediatrician | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Pediatrician
+        # 'terms: adolescents,children,infants,paediatrics'
+        terms: <translate with synonyms or related terms for 'Pediatrician', separated by commas>
+      amenity/doctors/pathology:
+        # amenity=doctors + healthcare:speciality=pathology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Pathologist
+        # 'terms: autopsy,anatomical pathology,anatomic pathology,pathology'
+        terms: <translate with synonyms or related terms for 'Pathologist', separated by commas>
+      amenity/doctors/plastic_surgery:
+        # amenity=doctors + healthcare:speciality=plastic_surgery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Plastic Surgeon
+        # 'terms: aesthetic surgery,cosmetic surgery,craniofacial surgery,reconstructive surgery,plastic surgery'
+        terms: <translate with synonyms or related terms for 'Plastic Surgeon', separated by commas>
+      amenity/doctors/podiatry:
+        # amenity=doctors + healthcare:speciality=podiatry | Chiropodist, Podiatric Surgeon | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Podiatrist
+        # 'terms: ankle,feet,foot,leg,legs,podiatry'
+        terms: <translate with synonyms or related terms for 'Podiatrist', separated by commas>
+      amenity/doctors/proctology:
+        # amenity=doctors + healthcare:speciality=proctology | Proctologist | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Colorectal Surgeon
+        # 'terms: assman,colorectal surgery,proctology'
+        terms: <translate with synonyms or related terms for 'Colorectal Surgeon', separated by commas>
+      amenity/doctors/pulmonology:
+        # amenity=doctors + healthcare:speciality=pulmonology | Pneumologist, Respiratory Physician, Respirologist | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Pulmonologist
+        # 'terms: asthma,chest medicine,lung,pneumology,pneumonology,pneumonia,pulmonology,respiratory tract,respirology,respiratory medicine'
+        terms: <translate with synonyms or related terms for 'Pulmonologist', separated by commas>
+      amenity/doctors/radiology:
+        # amenity=doctors + healthcare:speciality=radiology | Rontegenologist | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Radiologist
+        # 'terms: radiology,computed tomography,ct,magnetic resonance imaging,medical ultrasound,medical ultrasonography,mri,sonography,ultrasonography'
+        terms: <translate with synonyms or related terms for 'Radiologist', separated by commas>
+      amenity/doctors/rheumatology:
+        # amenity=doctors + healthcare:speciality=rheumatology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Rheumatologist
+        # 'terms: lupus,oteoporosis,rheuma,rheumatology'
+        terms: <translate with synonyms or related terms for 'Rheumatologist', separated by commas>
+      amenity/doctors/surgery:
+        # amenity=doctors + healthcare:speciality=surgery | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: General Surgeon
+        # 'terms: surgery'
+        terms: <translate with synonyms or related terms for 'General Surgeon', separated by commas>
+      amenity/doctors/trauma:
+        # amenity=doctors + healthcare:speciality=trauma | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Trauma Surgeon
+        # 'terms: surgery,trauma surgery'
+        terms: <translate with synonyms or related terms for 'Trauma Surgeon', separated by commas>
+      amenity/doctors/urology:
+        # amenity=doctors + healthcare:speciality=urology | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
+        name: Urologist
+        # 'terms: adrenal glands,bladder,epididymis,kidney,penis,prostate,reproductive,scrotum,testicles,testis,urethra,ureters,urology,urinary'
+        terms: <translate with synonyms or related terms for 'Urologist', separated by commas>
       amenity/dojo:
         # amenity=dojo | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Dojo / Martial Arts Academy
@@ -5633,9 +5758,9 @@ en:
         terms: <translate with synonyms or related terms for 'Food Bank', separated by commas>
       amenity/social_facility/group_home:
         # amenity=social_facility + social_facility=group_home + social_facility:for=senior | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Elderly Group Home
-        # 'terms: old,senior,living,care home,assisted living'
-        terms: <translate with synonyms or related terms for 'Elderly Group Home', separated by commas>
+        name: Group Home
+        # 'terms: assisted living,care home,elderly,living,old,senior'
+        terms: <translate with synonyms or related terms for 'Group Home', separated by commas>
       amenity/social_facility/homeless_shelter:
         # amenity=social_facility + social_facility=shelter + social_facility:for=homeless | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Homeless Shelter