diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index cb9bd38e1..c892eca8f 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -671,7 +671,9 @@
   ],
   "filter": [
     "has_image",
-    "open_now"
+    "public_access",
+    "open_now",
+    "wheelchair_accessible"
   ],
   "deletion": {
     "softDeletionTags": {
diff --git a/assets/layers/filters/filters.json b/assets/layers/filters/filters.json
index ffdddd3b1..2d38d1c90 100644
--- a/assets/layers/filters/filters.json
+++ b/assets/layers/filters/filters.json
@@ -441,7 +441,42 @@
           "osmTags": "indoor_seating=yes"
         }
       ]
+    },
+    {
+      "id": "public_access",
+      "options": [
+        {
+          "question": {
+            "en": "Open to the public",
+            "nl": "Publiek toegankelijk"
+          },
+          "osmTags": {
+            "or": [
+              "access=yes",
+              "access=public",
+              "access=permissive"
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "id": "wheelchair_accessible",
+      "options": [
+        {
+          "question": {
+            "en": "Accessible to wheelchair users",
+            "nl": "Toegankelijk voor rolstoelgebruikers"
+          },
+          "osmTags": {
+            "or": [
+              "wheelchair=yes",
+              "wheelchair=designated"
+            ]
+          }
+        }
+      ]
     }
   ],
   "allowMove": false
-}
\ No newline at end of file
+}
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 3b8f492bf..155ebfdec 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -5009,6 +5009,20 @@
                     }
                 }
             },
+            "18": {
+                "options": {
+                    "0": {
+                        "question": "Open to the public"
+                    }
+                }
+            },
+            "19": {
+                "options": {
+                    "0": {
+                        "question": "Accessible to wheelchair users"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 4dc2beb1a..363640514 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4796,6 +4796,20 @@
                     }
                 }
             },
+            "18": {
+                "options": {
+                    "0": {
+                        "question": "Publiek toegankelijk"
+                    }
+                }
+            },
+            "19": {
+                "options": {
+                    "0": {
+                        "question": "Toegankelijk voor rolstoelgebruikers"
+                    }
+                }
+            },
             "2": {
                 "options": {
                     "0": {