diff --git a/Models/Constants.ts b/Models/Constants.ts
index 52df36f..d5eced1 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -2,7 +2,7 @@ import { Utils } from "../Utils";
 
 export default class Constants {
     
-    public static vNumber = "0.6.4b";
+    public static vNumber = "0.6.4c";
 
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {
diff --git a/assets/themes/aed/aed.json b/assets/themes/aed/aed.json
index ef7e454..f15d3a1 100644
--- a/assets/themes/aed/aed.json
+++ b/assets/themes/aed/aed.json
@@ -125,7 +125,12 @@
             "nl": "Toegankelijkheid is {access}",
             "de": "Zugang ist {access}"
           },
-          "condition": "indoor=yes",
+          "condition": {
+            "or": [
+              "indoor=yes",
+              "access~*"
+            ]
+          },
           "freeform": {
             "key": "access",
             "addExtraTags": [
@@ -209,7 +214,10 @@
           }
         },
         {
-          "render": "{defibrillator:location}",
+          "render": {
+            "nl": "<i>Meer informatie over de locatie:</i><br/>{defibrillator:location}",
+            "en": "<i>Extra information about the location:</i><br/>{defibrillator:location}"
+          },
           "question": {
             "en": "Please give some explanation on where the defibrillator can be found",
             "ca": "Dóna detalls d'on es pot trobar el desfibril·lador",