diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md
index a2bf11189..6347c09a8 100644
--- a/Docs/CalculatedTags.md
+++ b/Docs/CalculatedTags.md
@@ -69,7 +69,7 @@ The above code will be executed for every feature in the layer. The feature is a
 
 ### distanceTo
 
-Calculates the distance between the feature and a specified point
+Calculates the distance between the feature and a specified point in kilometer. The input should either be a pair of coordinates, a geojson feature or the ID of an object
 
 *   longitude
 *   latitude
diff --git a/Docs/TagInfo/mapcomplete_aed.json b/Docs/TagInfo/mapcomplete_aed.json
index a13042985..30311f292 100644
--- a/Docs/TagInfo/mapcomplete_aed.json
+++ b/Docs/TagInfo/mapcomplete_aed.json
@@ -65,6 +65,25 @@
    "description": "Layer 'Defibrillators' shows access=private with a fixed text, namely 'Not accessible to the general public (e.g. only accesible to staff, the owners, ...)' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
    "value": "private"
   },
+  {
+   "key": "access",
+   "description": "Layer 'Defibrillators' shows access=no with a fixed text, namely 'Not accessible, possibly only for professional use' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "no"
+  },
+  {
+   "key": "defibrillator",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'defibrillator' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "defibrillator",
+   "description": "Layer 'Defibrillators' shows defibrillator=manual with a fixed text, namely 'This is a manual defibrillator for professionals' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "manual"
+  },
+  {
+   "key": "defibrillator",
+   "description": "Layer 'Defibrillators' shows defibrillator=automatic with a fixed text, namely 'This is a normal automatic defibrillator' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "automatic"
+  },
   {
    "key": "level",
    "description": "Layer 'Defibrillators' shows and asks freeform values for key 'level' (in the MapComplete.osm.be theme 'Open AED Map')"
@@ -72,6 +91,67 @@
   {
    "key": "defibrillator:location",
    "description": "Layer 'Defibrillators' shows and asks freeform values for key 'defibrillator:location' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "defibrillator:location:en",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'defibrillator:location:en' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "defibrillator:location:fr",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'defibrillator:location:fr' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "wheelchair",
+   "description": "Layer 'Defibrillators' shows wheelchair=designated with a fixed text, namely 'This defibrillator is specially adapated for wheelchair users' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "designated"
+  },
+  {
+   "key": "wheelchair",
+   "description": "Layer 'Defibrillators' shows wheelchair=yes with a fixed text, namely 'This defibrillator is easily reachable with a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "yes"
+  },
+  {
+   "key": "wheelchair",
+   "description": "Layer 'Defibrillators' shows wheelchair=limited with a fixed text, namely 'It is possible to reach the defibrillator in a wheelchair, but it is not easy' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "limited"
+  },
+  {
+   "key": "wheelchair",
+   "description": "Layer 'Defibrillators' shows wheelchair=no with a fixed text, namely 'This defibrillator is not reachable with a wheelchair' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map')",
+   "value": "no"
+  },
+  {
+   "key": "ref",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'ref' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "email",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'email' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "phone",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'phone' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "opening_hours",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'opening_hours' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "description",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'description' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "survey:date",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'survey:date' (in the MapComplete.osm.be theme 'Open AED Map')"
+  },
+  {
+   "key": "survey:date",
+   "description": "Layer 'Defibrillators' shows survey:date= with a fixed text, namely 'Checked today!' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Open AED Map') Picking this answer will delete the key survey:date.",
+   "value": ""
+  },
+  {
+   "key": "fixme",
+   "description": "Layer 'Defibrillators' shows and asks freeform values for key 'fixme' (in the MapComplete.osm.be theme 'Open AED Map')"
   }
  ]
 }
\ No newline at end of file
diff --git a/assets/themes/aed/aed_brugge.json b/assets/themes/aed/aed_brugge.json
index 65276b4f4..6b083ee49 100644
--- a/assets/themes/aed/aed_brugge.json
+++ b/assets/themes/aed/aed_brugge.json
@@ -49,5 +49,6 @@
       ]
     }
   ],
-  "hideFromOverview": true
+  "hideFromOverview": true,
+  "defaultBackgroundId": "HDM_HOT"
 }