diff --git a/index.html b/index.html
index 36b39db..6a5f0f0 100644
--- a/index.html
+++ b/index.html
@@ -562,13 +562,13 @@
       <p>
         View in:
         <a
-          href="https://maps.google.com/maps?q={{& name}}+{{address}},{{city}},NY"
+          href="https://maps.google.com/maps?q={{nameURLEscaped}} {{address}},{{city}},NY"
           target="_blank"
           >Google Maps</a
         >
         {{#isAppleIsh}}
         <a
-          href="http://maps.apple.com/?q={{& name}}&address={{address}},{{city}},NY"
+          href="http://maps.apple.com/?q={{nameURLEscaped}}&address={{address}},{{city}},NY"
           target="_blank"
           >Apple Maps</a
         >
@@ -618,6 +618,7 @@
             value.slug = slugify(value.name);
             value.cleanedWebsite = cleanWebsite(value.website);
             value.isAppleIsh = isAppleIsh;
+            value.nameURLEscaped = encodeURIComponent(value.name);
           });
           $("#storeCount").html(data.length);
           window.data = data;