diff --git a/data/presets.yaml b/data/presets.yaml
index ad6c66a16..c22df001a 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -178,6 +178,18 @@ en:
       bin:
         # bin=*
         label: Waste Bin
+      blood_components:
+        # 'blood:=*'
+        label: Blood Components
+        options:
+          # 'blood:=plasma'
+          plasma: plasma
+          # 'blood:=platelets'
+          platelets: platelets
+          # 'blood:=stemcells'
+          stemcells: stem cell samples
+          # 'blood:=whole'
+          whole: whole blood
       boundary:
         # boundary=*
         label: Type
@@ -2150,6 +2162,11 @@ en:
         # 'golf=water_hazard, natural=water'
         name: Water Hazard
         terms: '<translate with synonyms or related terms for ''Water Hazard'', separated by commas>'
+      healthcare/blood_donation:
+        # healthcare=blood_donation
+        name: Blood Donor Center
+        # 'terms: blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation'
+        terms: '<translate with synonyms or related terms for ''Blood Donor Center'', separated by commas>'
       highway:
         # highway=*
         name: Highway
@@ -2529,7 +2546,7 @@ en:
       leisure/miniature_golf:
         # leisure=miniature_golf
         name: Miniature Golf
-        # 'terms: crazy,mini,putt'
+        # 'terms: crazy golf,mini golf,putt-putt'
         terms: '<translate with synonyms or related terms for ''Miniature Golf'', separated by commas>'
       leisure/nature_reserve:
         # leisure=nature_reserve
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 769d588de..9c2edcbe4 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -238,6 +238,19 @@
         "type": "check",
         "label": "Waste Bin"
     },
+    "blood_components": {
+        "key": "blood:",
+        "type": "multiCombo",
+        "label": "Blood Components",
+        "strings": {
+            "options": {
+                "whole": "whole blood",
+                "plasma": "plasma",
+                "platelets": "platelets",
+                "stemcells": "stem cell samples"
+            }
+        }
+    },
     "boundary": {
         "key": "boundary",
         "type": "combo",
diff --git a/data/presets/fields/blood_components.json b/data/presets/fields/blood_components.json
new file mode 100644
index 000000000..d8629cb3a
--- /dev/null
+++ b/data/presets/fields/blood_components.json
@@ -0,0 +1,13 @@
+{
+    "key": "blood:",
+    "type": "multiCombo",
+    "label": "Blood Components",
+    "strings": {
+        "options": {
+            "whole": "whole blood",
+            "plasma": "plasma",
+            "platelets": "platelets",
+            "stemcells": "stem cell samples"
+        }
+    }
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 1448bc742..b3e6a44c1 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -4274,6 +4274,33 @@
         },
         "name": "Water Hazard"
     },
+    "healthcare/blood_donation": {
+        "icon": "hospital",
+        "fields": [
+            "operator",
+            "address",
+            "blood_components",
+            "opening_hours",
+            "ref"
+        ],
+        "geometry": [
+            "point",
+            "area"
+        ],
+        "terms": [
+            "blood bank",
+            "blood donation",
+            "blood transfusion",
+            "apheresis",
+            "plasmapheresis",
+            "plateletpheresis",
+            "stem cell donation"
+        ],
+        "tags": {
+            "healthcare": "blood_donation"
+        },
+        "name": "Blood Donor Center"
+    },
     "highway": {
         "fields": [
             "highway"
@@ -5712,9 +5739,9 @@
             "area"
         ],
         "terms": [
-            "crazy",
-            "mini",
-            "putt"
+            "crazy golf",
+            "mini golf",
+            "putt-putt"
         ],
         "tags": {
             "leisure": "miniature_golf"
diff --git a/data/presets/presets/healthcare/blood_donation.json b/data/presets/presets/healthcare/blood_donation.json
new file mode 100644
index 000000000..cda95b706
--- /dev/null
+++ b/data/presets/presets/healthcare/blood_donation.json
@@ -0,0 +1,28 @@
+{
+    "icon": "hospital",
+    "fields": [
+        "operator",
+        "address",
+        "blood_components",
+        "opening_hours",
+        "ref"
+    ],
+    "geometry": [
+        "point",
+        "area"
+    ],
+    "terms": [
+        "blood bank",
+        "blood donation",
+        "blood transfusion",
+        "apheresis",
+        "plasmapheresis",
+        "plateletpheresis",
+        "stem cell donation"
+    ],
+    "tags": {
+        "healthcare": "blood_donation"
+    },
+    "name": "Blood Donor Center"
+}
+ 
diff --git a/data/taginfo.json b/data/taginfo.json
index fbfa13499..501fecdb2 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -955,6 +955,10 @@
             "key": "natural",
             "value": "water"
         },
+        {
+            "key": "healthcare",
+            "value": "blood_donation"
+        },
         {
             "key": "highway"
         },
diff --git a/dist/locales/en.json b/dist/locales/en.json
index b8fb6e6f0..7f6613ea0 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -790,6 +790,15 @@
             "bin": {
                 "label": "Waste Bin"
             },
+            "blood_components": {
+                "label": "Blood Components",
+                "options": {
+                    "whole": "whole blood",
+                    "plasma": "plasma",
+                    "platelets": "platelets",
+                    "stemcells": "stem cell samples"
+                }
+            },
             "boundary": {
                 "label": "Type"
             },
@@ -2498,6 +2507,10 @@
                 "name": "Water Hazard",
                 "terms": ""
             },
+            "healthcare/blood_donation": {
+                "name": "Blood Donor Center",
+                "terms": "blood bank,blood donation,blood transfusion,apheresis,plasmapheresis,plateletpheresis,stem cell donation"
+            },
             "highway": {
                 "name": "Highway",
                 "terms": ""