diff --git a/data/presets.yaml b/data/presets.yaml
index a515db569..a6edfa8af 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1686,6 +1686,15 @@ en:
         name: Clinic
         # 'terms: medical,urgentcare'
         terms: '<translate with synonyms or related terms for ''Clinic'', separated by commas>'
+      amenity/clinic/abortion:
+        # 'amenity=clinic, healthcare=clinic, healthcare:speciality=abortion'
+        name: Abortion Clinic
+        terms: '<translate with synonyms or related terms for ''Abortion Clinic'', separated by commas>'
+      amenity/clinic/fertility:
+        # 'amenity=clinic, healthcare=clinic, healthcare:speciality=fertility'
+        name: Fertility Clinic
+        # 'terms: egg,fertility,reproductive,sperm,ovulation'
+        terms: '<translate with synonyms or related terms for ''Fertility Clinic'', separated by commas>'
       amenity/clock:
         # amenity=clock
         name: Clock
@@ -2771,6 +2780,26 @@ en:
         name: Healthcare Facility
         # 'terms: clinic,doctor,disease,health,institution,sick,surgery,wellness'
         terms: '<translate with synonyms or related terms for ''Healthcare Facility'', separated by commas>'
+      healthcare/alternative:
+        # healthcare=alternative
+        name: Alternative Medicine
+        # 'terms: acupuncture,anthroposophical,applied_kinesiology,aromatherapy,ayurveda,heabalism,homeopathy,hydrotherapy,hypnosis,naturopathy,osteopathy,reflexology,reiki,shiatsu,traditional,tuina,unani'
+        terms: '<translate with synonyms or related terms for ''Alternative Medicine'', separated by commas>'
+      healthcare/alternative/chiropractic:
+        # 'healthcare=alternative, healthcare:speciality=chiropractic'
+        name: Chiropractor
+        # 'terms: back,pain,spine'
+        terms: '<translate with synonyms or related terms for ''Chiropractor'', separated by commas>'
+      healthcare/audiologist:
+        # healthcare=audiologist
+        name: Audiologist
+        # 'terms: ear,hearing,sound'
+        terms: '<translate with synonyms or related terms for ''Audiologist'', separated by commas>'
+      healthcare/birthing_center:
+        # healthcare=birthing_center
+        name: Birthing Center
+        # 'terms: baby,childbirth,delivery,labour,labor,pregnancy'
+        terms: '<translate with synonyms or related terms for ''Birthing Center'', separated by commas>'
       healthcare/blood_donation:
         # healthcare=blood_donation
         name: Blood Donor Center
@@ -2784,8 +2813,43 @@ en:
       healthcare/midwife:
         # healthcare=midwife
         name: Midwife
-        # 'terms: pregnancy,childbirth'
+        # 'terms: baby,childbirth,delivery,labour,labor,pregnancy'
         terms: '<translate with synonyms or related terms for ''Midwife'', separated by commas>'
+      healthcare/occupational_therapist:
+        # healthcare=occupational_therapist
+        name: Occupational Therapist
+        # 'terms: therapist,therapy'
+        terms: '<translate with synonyms or related terms for ''Occupational Therapist'', separated by commas>'
+      healthcare/optometrist:
+        # healthcare=optometrist
+        name: Optometrist
+        # 'terms: eye,glasses,lasik,lenses,vision'
+        terms: '<translate with synonyms or related terms for ''Optometrist'', separated by commas>'
+      healthcare/physiotherapist:
+        # healthcare=physiotherapist
+        name: Physiotherapist
+        # 'terms: physical,therapist,therapy'
+        terms: '<translate with synonyms or related terms for ''Physiotherapist'', separated by commas>'
+      healthcare/podiatrist:
+        # healthcare=podiatrist
+        name: Podiatrist
+        # 'terms: foot,feet'
+        terms: '<translate with synonyms or related terms for ''Podiatrist'', separated by commas>'
+      healthcare/psychotherapist:
+        # healthcare=psychotherapist
+        name: Psychotherapist
+        # 'terms: anxiety,counselor,depression,mental health,mind,suicide,therapist,therapy'
+        terms: '<translate with synonyms or related terms for ''Psychotherapist'', separated by commas>'
+      healthcare/rehabilitation:
+        # healthcare=rehabilitation
+        name: Rehabilitation Facility
+        # 'terms: rehab,therapist,therapy'
+        terms: '<translate with synonyms or related terms for ''Rehabilitation Facility'', separated by commas>'
+      healthcare/speech_therapist:
+        # healthcare=speech_therapist
+        name: Speech Therapist
+        # 'terms: speech,therapist,therapy,voice'
+        terms: '<translate with synonyms or related terms for ''Speech Therapist'', separated by commas>'
       highway:
         # highway=*
         name: Highway
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 9d452bd76..5b2f1697c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -1184,6 +1184,64 @@
             },
             "name": "Clinic"
         },
+        "amenity/clinic/abortion": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [],
+            "tags": {
+                "amenity": "clinic",
+                "healthcare": "clinic",
+                "healthcare:speciality": "abortion"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "clinic"
+            },
+            "name": "Abortion Clinic"
+        },
+        "amenity/clinic/fertility": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "address",
+                "building_area",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "egg",
+                "fertility",
+                "reproductive",
+                "sperm",
+                "ovulation"
+            ],
+            "tags": {
+                "amenity": "clinic",
+                "healthcare": "clinic",
+                "healthcare:speciality": "fertility"
+            },
+            "reference": {
+                "key": "amenity",
+                "value": "clinic"
+            },
+            "name": "Fertility Clinic"
+        },
         "amenity/clock": {
             "icon": "poi-clock",
             "fields": [
@@ -6184,11 +6242,126 @@
             ],
             "name": "Healthcare Facility"
         },
+        "healthcare/alternative": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "acupuncture",
+                "anthroposophical",
+                "applied_kinesiology",
+                "aromatherapy",
+                "ayurveda",
+                "heabalism",
+                "homeopathy",
+                "hydrotherapy",
+                "hypnosis",
+                "naturopathy",
+                "osteopathy",
+                "reflexology",
+                "reiki",
+                "shiatsu",
+                "traditional",
+                "tuina",
+                "unani"
+            ],
+            "tags": {
+                "healthcare": "alternative"
+            },
+            "name": "Alternative Medicine"
+        },
+        "healthcare/alternative/chiropractic": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "back",
+                "pain",
+                "spine"
+            ],
+            "tags": {
+                "healthcare": "alternative",
+                "healthcare:speciality": "chiropractic"
+            },
+            "name": "Chiropractor"
+        },
+        "healthcare/audiologist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "ear",
+                "hearing",
+                "sound"
+            ],
+            "tags": {
+                "healthcare": "audiologist"
+            },
+            "name": "Audiologist"
+        },
+        "healthcare/birthing_center": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "baby",
+                "childbirth",
+                "delivery",
+                "labour",
+                "labor",
+                "pregnancy"
+            ],
+            "tags": {
+                "healthcare": "birthing_center"
+            },
+            "name": "Birthing Center"
+        },
         "healthcare/blood_donation": {
             "icon": "blood-bank",
             "fields": [
                 "name",
                 "operator",
+                "healthcare/speciality",
                 "blood_components",
                 "address",
                 "building_area",
@@ -6217,6 +6390,7 @@
             "fields": [
                 "name",
                 "operator",
+                "healthcare/speciality",
                 "building_area",
                 "address",
                 "opening_hours"
@@ -6239,6 +6413,7 @@
             "fields": [
                 "name",
                 "operator",
+                "healthcare/speciality",
                 "building_area",
                 "address",
                 "opening_hours"
@@ -6248,14 +6423,192 @@
                 "area"
             ],
             "terms": [
-                "pregnancy",
-                "childbirth"
+                "baby",
+                "childbirth",
+                "delivery",
+                "labour",
+                "labor",
+                "pregnancy"
             ],
             "tags": {
                 "healthcare": "midwife"
             },
             "name": "Midwife"
         },
+        "healthcare/occupational_therapist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "therapist",
+                "therapy"
+            ],
+            "tags": {
+                "healthcare": "occupational_therapist"
+            },
+            "name": "Occupational Therapist"
+        },
+        "healthcare/optometrist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "eye",
+                "glasses",
+                "lasik",
+                "lenses",
+                "vision"
+            ],
+            "tags": {
+                "healthcare": "optometrist"
+            },
+            "name": "Optometrist"
+        },
+        "healthcare/physiotherapist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "physical",
+                "therapist",
+                "therapy"
+            ],
+            "tags": {
+                "healthcare": "physiotherapist"
+            },
+            "name": "Physiotherapist"
+        },
+        "healthcare/podiatrist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "foot",
+                "feet"
+            ],
+            "tags": {
+                "healthcare": "podiatrist"
+            },
+            "name": "Podiatrist"
+        },
+        "healthcare/psychotherapist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "anxiety",
+                "counselor",
+                "depression",
+                "mental health",
+                "mind",
+                "suicide",
+                "therapist",
+                "therapy"
+            ],
+            "tags": {
+                "healthcare": "psychotherapist"
+            },
+            "name": "Psychotherapist"
+        },
+        "healthcare/rehabilitation": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "rehab",
+                "therapist",
+                "therapy"
+            ],
+            "tags": {
+                "healthcare": "rehabilitation"
+            },
+            "name": "Rehabilitation Facility"
+        },
+        "healthcare/speech_therapist": {
+            "icon": "hospital",
+            "fields": [
+                "name",
+                "operator",
+                "healthcare/speciality",
+                "building_area",
+                "address",
+                "opening_hours"
+            ],
+            "geometry": [
+                "point",
+                "area"
+            ],
+            "terms": [
+                "speech",
+                "therapist",
+                "therapy",
+                "voice"
+            ],
+            "tags": {
+                "healthcare": "speech_therapist"
+            },
+            "name": "Speech Therapist"
+        },
         "highway/bridleway": {
             "fields": [
                 "name",
diff --git a/data/presets/presets/amenity/clinic/abortion.json b/data/presets/presets/amenity/clinic/abortion.json
new file mode 100644
index 000000000..8fb2db4a5
--- /dev/null
+++ b/data/presets/presets/amenity/clinic/abortion.json
@@ -0,0 +1,27 @@
+{
+    "icon": "hospital",
+    "fields": [
+        "name",
+        "operator",
+        "healthcare/speciality",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+    ],
+    "tags": {
+        "amenity": "clinic",
+        "healthcare": "clinic",
+        "healthcare:speciality": "abortion"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "clinic"
+    },
+    "name": "Abortion Clinic"
+}
diff --git a/data/presets/presets/amenity/clinic/fertility.json b/data/presets/presets/amenity/clinic/fertility.json
new file mode 100644
index 000000000..aa44f484a
--- /dev/null
+++ b/data/presets/presets/amenity/clinic/fertility.json
@@ -0,0 +1,32 @@
+{
+    "icon": "hospital",
+    "fields": [
+        "name",
+        "operator",
+        "healthcare/speciality",
+        "address",
+        "building_area",
+        "opening_hours"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "egg",
+        "fertility",
+        "reproductive",
+        "sperm",
+        "ovulation"
+    ],
+    "tags": {
+        "amenity": "clinic",
+        "healthcare": "clinic",
+        "healthcare:speciality": "fertility"
+    },
+    "reference": {
+        "key": "amenity",
+        "value": "clinic"
+    },
+    "name": "Fertility Clinic"
+}
diff --git a/data/taginfo.json b/data/taginfo.json
index 5ffde27bc..b8d2cf377 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -243,6 +243,14 @@
             "key": "amenity",
             "value": "clinic"
         },
+        {
+            "key": "healthcare:speciality",
+            "value": "abortion"
+        },
+        {
+            "key": "healthcare:speciality",
+            "value": "fertility"
+        },
         {
             "key": "amenity",
             "value": "clock"
@@ -1204,6 +1212,22 @@
         {
             "key": "healthcare"
         },
+        {
+            "key": "healthcare",
+            "value": "alternative"
+        },
+        {
+            "key": "healthcare:speciality",
+            "value": "chiropractic"
+        },
+        {
+            "key": "healthcare",
+            "value": "audiologist"
+        },
+        {
+            "key": "healthcare",
+            "value": "birthing_center"
+        },
         {
             "key": "healthcare",
             "value": "blood_donation"
@@ -1216,6 +1240,34 @@
             "key": "healthcare",
             "value": "midwife"
         },
+        {
+            "key": "healthcare",
+            "value": "occupational_therapist"
+        },
+        {
+            "key": "healthcare",
+            "value": "optometrist"
+        },
+        {
+            "key": "healthcare",
+            "value": "physiotherapist"
+        },
+        {
+            "key": "healthcare",
+            "value": "podiatrist"
+        },
+        {
+            "key": "healthcare",
+            "value": "psychotherapist"
+        },
+        {
+            "key": "healthcare",
+            "value": "rehabilitation"
+        },
+        {
+            "key": "healthcare",
+            "value": "speech_therapist"
+        },
         {
             "key": "highway",
             "value": "bridleway"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 06c9609b0..526b80556 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2549,6 +2549,14 @@
                     "name": "Clinic",
                     "terms": "medical,urgentcare"
                 },
+                "amenity/clinic/abortion": {
+                    "name": "Abortion Clinic",
+                    "terms": ""
+                },
+                "amenity/clinic/fertility": {
+                    "name": "Fertility Clinic",
+                    "terms": "egg,fertility,reproductive,sperm,ovulation"
+                },
                 "amenity/clock": {
                     "name": "Clock",
                     "terms": ""
@@ -3517,6 +3525,22 @@
                     "name": "Healthcare Facility",
                     "terms": "clinic,doctor,disease,health,institution,sick,surgery,wellness"
                 },
+                "healthcare/alternative": {
+                    "name": "Alternative Medicine",
+                    "terms": "acupuncture,anthroposophical,applied_kinesiology,aromatherapy,ayurveda,heabalism,homeopathy,hydrotherapy,hypnosis,naturopathy,osteopathy,reflexology,reiki,shiatsu,traditional,tuina,unani"
+                },
+                "healthcare/alternative/chiropractic": {
+                    "name": "Chiropractor",
+                    "terms": "back,pain,spine"
+                },
+                "healthcare/audiologist": {
+                    "name": "Audiologist",
+                    "terms": "ear,hearing,sound"
+                },
+                "healthcare/birthing_center": {
+                    "name": "Birthing Center",
+                    "terms": "baby,childbirth,delivery,labour,labor,pregnancy"
+                },
                 "healthcare/blood_donation": {
                     "name": "Blood Donor Center",
                     "terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
@@ -3527,7 +3551,35 @@
                 },
                 "healthcare/midwife": {
                     "name": "Midwife",
-                    "terms": "pregnancy,childbirth"
+                    "terms": "baby,childbirth,delivery,labour,labor,pregnancy"
+                },
+                "healthcare/occupational_therapist": {
+                    "name": "Occupational Therapist",
+                    "terms": "therapist,therapy"
+                },
+                "healthcare/optometrist": {
+                    "name": "Optometrist",
+                    "terms": "eye,glasses,lasik,lenses,vision"
+                },
+                "healthcare/physiotherapist": {
+                    "name": "Physiotherapist",
+                    "terms": "physical,therapist,therapy"
+                },
+                "healthcare/podiatrist": {
+                    "name": "Podiatrist",
+                    "terms": "foot,feet"
+                },
+                "healthcare/psychotherapist": {
+                    "name": "Psychotherapist",
+                    "terms": "anxiety,counselor,depression,mental health,mind,suicide,therapist,therapy"
+                },
+                "healthcare/rehabilitation": {
+                    "name": "Rehabilitation Facility",
+                    "terms": "rehab,therapist,therapy"
+                },
+                "healthcare/speech_therapist": {
+                    "name": "Speech Therapist",
+                    "terms": "speech,therapist,therapy,voice"
                 },
                 "highway/bridleway": {
                     "name": "Bridle Path",