4 files changed, 5 insertions, 4 deletions
diff --git a/templates/web/default/maps/fms.html b/templates/web/default/maps/fms.html
index 6e6d747bf..2b322849b 100644
--- a/templates/web/default/maps/fms.html
+++ b/templates/web/default/maps/fms.html
@@ -1,8 +1,9 @@
 [% map_js = BLOCK %]
 <!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> -->
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
+<script type="text/javascript" src="/js/OpenLayers.fixmystreet.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-bing-ol.js"></script>
+<script type="text/javascript" src="/js/jquery.ba-hashchange.min.js"></script>
 <!--[if lte IE 6]>
   <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" />
 <![endif]-->
diff --git a/templates/web/default/maps/openlayers.html b/templates/web/default/maps/openlayers.html
index b84799fdd..3cf615306 100644
--- a/templates/web/default/maps/openlayers.html
+++ b/templates/web/default/maps/openlayers.html
@@ -9,7 +9,7 @@
 var fixmystreet = {
     'page': '[% page %]',
     'area': '[% map.area %]',
-    'all_pins': [% all_pins || "''" | html %],
+    'all_pins': '[% all_pins %]',
     'latitude': [% map.latitude %],
     'longitude': [% map.longitude %],
 [% IF map.any_zoom -%]
diff --git a/templates/web/default/maps/osm-streetview.html b/templates/web/default/maps/osm-streetview.html
index 9de99c253..3c97af5b9 100644
--- a/templates/web/default/maps/osm-streetview.html
+++ b/templates/web/default/maps/osm-streetview.html
@@ -1,5 +1,5 @@
 [% map_js = BLOCK %]
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
+<script type="text/javascript" src="/js/OpenLayers.fixmystreet.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-streetview.js"></script>
 <!--[if lte IE 6]>
diff --git a/templates/web/default/maps/osm.html b/templates/web/default/maps/osm.html
index e2762ee26..b0607220f 100644
--- a/templates/web/default/maps/osm.html
+++ b/templates/web/default/maps/osm.html
@@ -1,5 +1,5 @@
 [% map_js = BLOCK %]
-<script type="text/javascript" src="/jslib/OpenLayers-2.10/OpenLayers.js"></script>
+<script type="text/javascript" src="/js/OpenLayers.fixmystreet.js"></script>
 <script type="text/javascript" src="/js/map-OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
 <!--[if lte IE 6]>