5 files changed, 18 insertions, 7 deletions
diff --git a/templates/web/base/admin/extra-metadata-form.html b/templates/web/base/admin/extra-metadata-form.html
index 9264d98d9..4fc5d8e3f 100644
--- a/templates/web/base/admin/extra-metadata-form.html
+++ b/templates/web/base/admin/extra-metadata-form.html
@@ -12,7 +12,7 @@
         <div class="admin-hint"><p>[% loc('Whether the field is displayed to the user, included as a hidden field and automatically populated, or set by the server upon Open311 submission. This field is usually set automatically.') %]</p></div>
         <label>
             [% loc('Automated') %]
-            <select name="metadata[[% loop.index %]].automated" data-field-name="automated" class="js-metadata-item-type">
+            <select name="metadata[[% loop.index %]].automated" data-field-name="automated">
                 <option value="" [% meta.automated == '' ? 'selected' : '' %]></option>
                 <option value="server_set" [% meta.automated == 'server_set' ? 'selected' : '' %]>[% loc('Server Set') %]</option>
                 <option value="hidden_field" [% meta.automated == 'hidden_field' ? 'selected' : '' %]>[% loc('Hidden Field') %]</option>
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 21081246d..e29d96655 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -38,7 +38,7 @@
     <link rel="prefetch" href="[% version('/cobrands/fixmystreet/fixmystreet.js') %]">
 [% END %]
 [% IF NOT bodyclass.match('mappage') %]
-    [% FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra', c)) %]
+    [% FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra')) %]
         <link rel="prefetch" href="[% IF script.match('^/'); version(script); ELSE; script; END %]">
     [% END %]
     <link rel="prefetch" href="[% version('/cobrands/fixmystreet/map.js') %]">
diff --git a/templates/web/base/common_scripts.html b/templates/web/base/common_scripts.html
index ac66aad46..fd7011763 100644
--- a/templates/web/base/common_scripts.html
+++ b/templates/web/base/common_scripts.html
@@ -47,7 +47,7 @@ IF c.user_exists AND (c.user.from_body OR c.user.is_superuser);
 END;
 
 IF bodyclass.match('mappage');
-    FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra', c));
+    FOR script IN map_js.merge(c.cobrand.call_hook('map_js_extra'));
         IF script.match('^/');
             scripts.push(version(script));
         ELSE;
diff --git a/templates/web/fixmystreet-uk-councils/footer_extra_js.html b/templates/web/fixmystreet-uk-councils/footer_extra_js.html
index 1742a55e2..76451344b 100644
--- a/templates/web/fixmystreet-uk-councils/footer_extra_js.html
+++ b/templates/web/fixmystreet-uk-councils/footer_extra_js.html
@@ -1,5 +1,12 @@
 [% scripts.push(
-    version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js')
     version('/cobrands/fixmystreet-uk-councils/js.js'),
-    version('/cobrands/highways/assets.js'),
 ) %]
+[%~
+IF bodyclass.match('mappage');
+    scripts.push(
+        version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
+        version('/cobrands/fixmystreet/assets.js'),
+        version('/cobrands/highways/assets.js'),
+    );
+END
+%]
diff --git a/templates/web/oxfordshire/footer_extra_js.html b/templates/web/oxfordshire/footer_extra_js.html
index d95ed2c8e..24ec8486a 100644
--- a/templates/web/oxfordshire/footer_extra_js.html
+++ b/templates/web/oxfordshire/footer_extra_js.html
@@ -1,8 +1,12 @@
-[% scripts.push(
+[%
+IF bodyclass.match('mappage');
+  scripts.push(
     version('/cobrands/fixmystreet/assets.js'),
     version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'),
     version('/cobrands/oxfordshire/js.js'),
     version('/cobrands/oxfordshire/assets.js'),
     version('/cobrands/highways/assets.js'),
     version('/cobrands/fixmystreet-uk-councils/council_validation_rules.js'),
-) %]
+  );
+END;
+%]