diff --git a/data/presets.yaml b/data/presets.yaml
index 75878815d..6db563f43 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -630,6 +630,9 @@ en:
       date:
         # date=*
         label: Date
+      defibrillator/location:
+        # 'defibrillator:location=*'
+        label: Location Description
       delivery:
         # delivery=*
         label: Delivery
diff --git a/data/presets/fields.json b/data/presets/fields.json
index e5a181327..ff52d9b5f 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -108,6 +108,7 @@
   "cycleway": {"keys": ["cycleway", "cycleway:left", "cycleway:right"], "reference": {"key": "cycleway"}, "type": "cycleway", "label": "Bike Lanes", "placeholder": "none", "strings": {"types": {"cycleway:left": "Left side", "cycleway:right": "Right side"}, "options": {"none": {"title": "None", "description": "No bike lane"}, "lane": {"title": "Standard bike lane", "description": "A bike lane separated from auto traffic by a painted line"}, "shared_lane": {"title": "Shared bike lane", "description": "A bike lane with no separation from auto traffic"}, "track": {"title": "Bike track", "description": "A bike lane separated from traffic by a physical barrier"}, "share_busway": {"title": "Bike lane shared with bus", "description": "A bike lane shared with a bus lane"}, "opposite_lane": {"title": "Opposite bike lane", "description": "A bike lane that travels in the opposite direction of traffic"}, "opposite": {"title": "Contraflow bike lane", "description": "A bike lane that travels in both directions on a one-way street"}}}},
   "dance/style": {"key": "dance:style", "type": "semiCombo", "label": "Dance Styles"},
   "date": {"key": "date", "type": "check", "label": "Date"},
+  "defibrillator/location": {"key": "defibrillator:location", "type": "textarea", "label": "Location Description"},
   "delivery": {"key": "delivery", "type": "check", "label": "Delivery"},
   "denomination": {"key": "denomination", "type": "combo", "label": "Denomination", "prerequisiteTag": {"key": "religion", "valueNot": "none"}},
   "denotation": {"key": "denotation", "type": "combo", "label": "Denotation"},
diff --git a/data/presets/fields/defibrillator/location.json b/data/presets/fields/defibrillator/location.json
new file mode 100644
index 000000000..a04347396
--- /dev/null
+++ b/data/presets/fields/defibrillator/location.json
@@ -0,0 +1,5 @@
+{
+    "key": "defibrillator:location",
+    "type": "textarea",
+    "label": "Location Description"
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7f8686cf2..f7bcebd66 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -458,7 +458,7 @@
   "emergency/private": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "private"}, "name": "Emergency Access Private", "searchable": false, "matchScore": 0.01},
   "emergency/yes": {"fields": ["emergency_combo"], "geometry": ["line"], "tags": {"emergency": "yes"}, "name": "Emergency Access Yes", "searchable": false, "matchScore": 0.01},
   "emergency/ambulance_station": {"icon": "fas-ambulance", "fields": ["name", "operator", "building_area", "address"], "moreFields": ["email", "fax", "gnis/feature_id", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["EMS", "EMT", "rescue"], "tags": {"emergency": "ambulance_station"}, "name": "Ambulance Station"},
-  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
+  "emergency/defibrillator": {"icon": "maki-defibrillator", "fields": ["indoor", "ref", "operator", "defibrillator/location"], "moreFields": ["level", "opening_hours", "access_simple"], "geometry": ["point", "vertex"], "terms": ["AED"], "tags": {"emergency": "defibrillator"}, "name": "Defibrillator"},
   "emergency/fire_alarm": {"icon": "fas-bell", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_alarm_box"}, "name": "Fire Alarm Call Box"},
   "emergency/fire_extinguisher": {"icon": "fas-fire-extinguisher", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_extinguisher"}, "name": "Fire Extinguisher"},
   "emergency/fire_hose": {"icon": "fas-tape", "fields": ["indoor", "ref", "operator"], "moreFields": ["level"], "geometry": ["point", "vertex"], "tags": {"emergency": "fire_hose"}, "name": "Fire Hose"},
diff --git a/data/presets/presets/emergency/defibrillator.json b/data/presets/presets/emergency/defibrillator.json
index f3cae15de..a3c3303a1 100644
--- a/data/presets/presets/emergency/defibrillator.json
+++ b/data/presets/presets/emergency/defibrillator.json
@@ -3,10 +3,13 @@
     "fields": [
         "indoor",
         "ref",
-        "operator"
+        "operator",
+        "defibrillator/location"
     ],
     "moreFields": [
-        "level"
+        "level",
+        "opening_hours",
+        "access_simple"
     ],
     "geometry": [
         "point",
diff --git a/data/taginfo.json b/data/taginfo.json
index 4ce02a473..8fb110056 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -1465,6 +1465,7 @@
     {"key": "cycleway:right", "value": "opposite", "description": "🄵 Bike Lanes"},
     {"key": "dance:style", "description": "🄵 Dance Styles"},
     {"key": "date", "description": "🄵 Date"},
+    {"key": "defibrillator:location", "description": "🄵 Location Description"},
     {"key": "delivery", "description": "🄵 Delivery"},
     {"key": "denomination", "description": "🄵 Denomination"},
     {"key": "denotation", "description": "🄵 Denotation"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index c72c10d13..a2e7dabe9 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -3304,6 +3304,9 @@
                 "date": {
                     "label": "Date"
                 },
+                "defibrillator/location": {
+                    "label": "Location Description"
+                },
                 "delivery": {
                     "label": "Delivery",
                     "terms": ""
@@ -10744,6 +10747,20 @@
                 "description": "Annotation overlay provided by basemap.at.",
                 "name": "basemap.at Overlay"
             },
+            "basemap.at-surface": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Surface layer provided by basemap.at.",
+                "name": "basemap.at Surface"
+            },
+            "basemap.at-terrain": {
+                "attribution": {
+                    "text": "basemap.at"
+                },
+                "description": "Terrain layer provided by basemap.at.",
+                "name": "basemap.at Terrain"
+            },
             "eufar-balaton": {
                 "attribution": {
                     "text": "EUFAR Balaton ortofotó 2010"
@@ -10765,13 +10782,6 @@
                 "description": "The city map is an overview map that describes Gothenburg. It contains general information about land, communications, hydrography, buildings, address numbers and street names, administrative division and other orientation text.",
                 "name": "Gothenburg City map"
             },
-            "gothenburg-ortho": {
-                "attribution": {
-                    "text": "© Gothenburg municipality, CC0"
-                },
-                "description": "Orthophoto for Gothenburg municipality",
-                "name": "Gothenburg Orthophoto"
-            },
             "gsi.go.jp_airphoto": {
                 "attribution": {
                     "text": "GSI Japan"
@@ -10869,27 +10879,6 @@
                 },
                 "name": "OpenPT Map (overlay)"
             },
-            "openrailwaymap": {
-                "attribution": {
-                    "text": "Rendering: OpenRailwayMap, © Map data OpenStreetMap contributors"
-                },
-                "description": "Overlay imagery showing railway infrastructure based on OpenStreetMap data",
-                "name": "OpenRailwayMap"
-            },
-            "openrailwaymap-maxspeeds": {
-                "attribution": {
-                    "text": "Rendering: OpenRailwayMap, © Map data OpenStreetMap contributors"
-                },
-                "description": "Overlay imagery showing railway speed limits based on OpenStreetMap data",
-                "name": "OpenRailwayMap Maxspeeds"
-            },
-            "openrailwaymap-signalling": {
-                "attribution": {
-                    "text": "Rendering: OpenRailwayMap, © Map data OpenStreetMap contributors"
-                },
-                "description": "Overlay imagery showing railway signals based on OpenStreetMap data",
-                "name": "OpenRailwayMap Signalling"
-            },
             "osm-gps": {
                 "attribution": {
                     "text": "© OpenStreetMap contributors"
@@ -10960,12 +10949,6 @@
                 },
                 "name": "Thunderforest Landscape"
             },
-            "tf-outdoors": {
-                "attribution": {
-                    "text": "Maps © Thunderforest, Data © OpenStreetMap contributors"
-                },
-                "name": "Thunderforest Outdoors"
-            },
             "trafikverket-baninfo": {
                 "attribution": {
                     "text": "© Trafikverket, CC0"
@@ -11008,12 +10991,6 @@
                 "description": "Swedish NVDB road network with several options for map layers",
                 "name": "Trafikverket Road Network options"
             },
-            "wroclaw-orto2018": {
-                "attribution": {
-                    "text": "Urząd Miasta Wrocław"
-                },
-                "name": "Wrocław: Orthophotomap 2018 (aerial image)"
-            },
             "Maxar-Premium": {
                 "name": "Maxar Premium Imagery (Beta)",
                 "attribution": {