diff --git a/app/static/js/map.js b/app/static/js/map.js
index 45a198f..db2126e 100644
--- a/app/static/js/map.js
+++ b/app/static/js/map.js
@@ -27,7 +27,8 @@ function performRequest(url, location, success_callback) {
 
 let marker_icon = L.icon({
     iconUrl: "/static/images/marker-icon.png",
-    shadowUrl: "/static/images/marker-shadow.png"
+    shadowUrl: "/static/images/marker-shadow.png",
+    iconAnchor: [12, 41]
 });
 
 let callback = function OSMCallBack(location, data) {
diff --git a/app/templates/maps.html b/app/templates/maps.html
index da45976..88077fe 100644
--- a/app/templates/maps.html
+++ b/app/templates/maps.html
@@ -23,13 +23,16 @@
  let locations = [];
  let loc = {};
 
- {% for loc in locations -%}
+{% for loc in locations -%}
+    {% if loc.address %}
     loc = {
         "address": "{{loc.address}}",
         "name": "{{loc.name}}"
     };
- locations.push(loc);
- {%- endfor %}
+    locations.push(loc);
+
+    {% endif %}
+{%- endfor %}
 
  loadmap(locations);
 </script>