diff --git a/assets/layers/defibrillator/defibrillator.json b/assets/layers/defibrillator/defibrillator.json
index 66d0470c9c..a2ea92e9d0 100644
--- a/assets/layers/defibrillator/defibrillator.json
+++ b/assets/layers/defibrillator/defibrillator.json
@@ -11,6 +11,10 @@
   "source": {
     "osmTags": "emergency=defibrillator"
   },
+  "calculatedTags": [
+    "_days_since_last_survey=Math.floor(new Date() - new Date(feat.properties['survey:date'])/(1000*60*60*24))",
+    "_recently_surveyed=Number(feat.properties._days_since_last_survey) <= 90"
+  ],
   "minzoom": 12,
   "title": {
     "render": {
@@ -26,11 +30,7 @@
     "render": "./assets/themes/aed/aed.svg",
     "mappings": [
       {
-        "if": {
-          "and": [
-            "survey:date~*"
-          ]
-        },
+        "if": "_recently_surveyed=true",
         "then": {
           "en": "./assets/layers/defibrillator/aed_checked.svg"
         }
@@ -408,7 +408,7 @@
       }
     },
     {
-      "question":{
+      "question": {
         "en": "When was this defibrillator last surveyed?",
         "nl": "Wanneer is deze defibrillator het laatst gecontroleerd in OpenStreetMap?"
       },
diff --git a/assets/themes/personalLayout/personalLayout.json b/assets/themes/personalLayout/personalLayout.json
index a7c39ffb00..046d184558 100644
--- a/assets/themes/personalLayout/personalLayout.json
+++ b/assets/themes/personalLayout/personalLayout.json
@@ -31,6 +31,6 @@
   "startLon": 0,
   "startZoom": 16,
   "widenFactor": 0.05,
-  "layers": [  ],
+  "layers": [ ],
   "roamingRenderings": []
 }
\ No newline at end of file
diff --git a/assets/translations.json b/assets/translations.json
index 346c113287..dc55b036e3 100644
--- a/assets/translations.json
+++ b/assets/translations.json
@@ -153,7 +153,8 @@
       "de": "Erledigt!"
     },
     "retrying": {
-      "en": "Loading data failed. Trying again... ({count})",
+      "en": "Loading data failed. Trying again in {count} seconds...",
+      "nl": "Data inladed mislukt - wordt opnieuw geladen over {count} seconden",
       "ca": "La càrrega de dades ha fallat. Tornant-ho a intentar... ({count})",
       "es": "La carga de datos ha fallado. Volviéndolo a probar... ({count})",
       "gl": "A carga dos datos fallou. Tentándoo de novo... ({count})",