diff --git a/Logic/ExtraFunction.ts b/Logic/ExtraFunction.ts
index 8b6834e09..04f7a64f6 100644
--- a/Logic/ExtraFunction.ts
+++ b/Logic/ExtraFunction.ts
@@ -134,11 +134,18 @@ export class ExtraFunction {
             args: ["list of features or layer name", "amount of features", "unique tag key (optional)", "maxDistanceInMeters (optional)"]
         },
         (params, feature) => {
-            return (features, amount, uniqueTag, maxDistanceInMeters) => ExtraFunction.GetClosestNFeatures(params, feature, features, {
-                maxFeatures: Number(amount),
-                uniqueTag: uniqueTag,
-                maxDistance: Number(maxDistanceInMeters)
-            })
+           
+            return (features, amount, uniqueTag, maxDistanceInMeters) => {
+                let distance : number = Number(maxDistanceInMeters)
+                if(isNaN(distance)){
+                    distance = undefined
+                }
+                return ExtraFunction.GetClosestNFeatures(params, feature, features, {
+                    maxFeatures: Number(amount),
+                    uniqueTag: uniqueTag,
+                    maxDistance: distance
+                });
+            }
         }
     )
 
diff --git a/assets/themes/uk_addresses/uk_addresses.json b/assets/themes/uk_addresses/uk_addresses.json
index 654bb2177..e43f867ed 100644
--- a/assets/themes/uk_addresses/uk_addresses.json
+++ b/assets/themes/uk_addresses/uk_addresses.json
@@ -149,17 +149,17 @@
           "mappings": [
             {
               "if": "addr:street:={_closest_street:0:name}",
-              "then": "<b>{_closest_street:0:name}</b> {_closest_street:0:distance}m",
+              "then": "Located in <b>{_closest_street:0:name}</b> (~{_closest_street:0:distance}m away)",
               "hideInAnswer": "_closest_street:0:name="
             },
             {
               "if": "addr:street:={_closest_street:1:name}",
-              "then": "<b>{_closest_street:1:name}</b> {_closest_street:1:distance}m",
+              "then": "Located in <b>{_closest_street:1:name}</b> (~{_closest_street:1:distance}m away)",
               "hideInAnswer": "_closest_street:1:name="
             },
             {
               "if": "addr:street:={_closest_street:2:name}",
-              "then": "<b>{_closest_street:2:name}</b> {_closest_street:2:distance}m",
+              "then": "Located in <b>{_closest_street:2:name}</b> (~{_closest_street:2:distance}m away)",
               "hideInAnswer": "_closest_street:2:name="
             }
           ],
@@ -214,7 +214,11 @@
           }
         ]
       },
-      "presets": []
+      "presets": [
+        {
+          
+        }
+      ]
     },
     {
       "id": "named_streets",