diff --git a/RIGS/templates/event_checklist_form.html b/RIGS/templates/event_checklist_form.html
index 08177cd0..a1fe1759 100644
--- a/RIGS/templates/event_checklist_form.html
+++ b/RIGS/templates/event_checklist_form.html
@@ -17,6 +17,7 @@
 
 {% block js %}
     {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise-->
     <script src="{% static 'js/interaction.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
diff --git a/RIGS/templates/event_form.html b/RIGS/templates/event_form.html
index 465985cf..572a4271 100644
--- a/RIGS/templates/event_form.html
+++ b/RIGS/templates/event_form.html
@@ -7,7 +7,7 @@
 
 {% block css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/selects.css' %}"/>
+    <link rel="stylesheet" type="text/css" href="{% static 'css/selects.css' %}"/>
 {% endblock %}
 
 {% block preload_js %}
@@ -17,6 +17,7 @@
 
 {% block js %}
     {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise--->
     <script src="{% static 'js/interaction.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
diff --git a/RIGS/templates/risk_assessment_form.html b/RIGS/templates/risk_assessment_form.html
index 2fba78af..30c47c1b 100644
--- a/RIGS/templates/risk_assessment_form.html
+++ b/RIGS/templates/risk_assessment_form.html
@@ -16,6 +16,7 @@
 
 {% block js %}
     {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
     <script src="{% static 'js/jquery-ui.js' %}"></script><!--TODO optimise--->
     <script src="{% static 'js/interaction.js' %}"></script>
     <script src="{% static 'js/tooltip.js' %}"></script>
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index bbea3a54..905d3942 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -9,11 +9,12 @@
 
 {% block preload_js %}
     {{ block.super }}
-    <script src="{% static 'js/selects.js' %}" async></script>
+    <script src="{% static 'js/selects.js' %}"></script>
 {% endblock %}
 
 {% block js %}
     {{ block.super }}
+    <script src="{% static 'js/autocompleter.js' %}"></script>
     <script>
         const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
         dur = matches ? 0 : 500;
diff --git a/assets/tests/pages.py b/assets/tests/pages.py
index 77dc4155..420c8864 100644
--- a/assets/tests/pages.py
+++ b/assets/tests/pages.py
@@ -17,6 +17,7 @@ class AssetList(BasePage):
     _status_select_locator = (By.CSS_SELECTOR, 'div#status-group>div.bootstrap-select')
     _category_select_locator = (By.CSS_SELECTOR, 'div#category-group>div.bootstrap-select')
     _go_button_locator = (By.ID, 'id_search')
+    _filter_button_locator = (By.ID, 'filter-submit')
 
     class AssetListRow(Region):
         _asset_id_locator = (By.CLASS_NAME, "assetID")
@@ -56,6 +57,9 @@ class AssetList(BasePage):
     def search(self):
         self.find_element(*self._go_button_locator).click()
 
+    def filter(self):
+        self.find_element(*self._filter_button_locator).click()
+
     @property
     def status_selector(self):
         return regions.BootstrapSelectElement(self, self.find_element(*self._status_select_locator))
diff --git a/assets/tests/test_interaction.py b/assets/tests/test_interaction.py
index f048498a..8c414a5d 100644
--- a/assets/tests/test_interaction.py
+++ b/assets/tests/test_interaction.py
@@ -78,7 +78,7 @@ class TestAssetList(AutoLoginTest):
         self.page.status_selector.select_all()
         self.page.status_selector.toggle()
         self.assertFalse(self.page.status_selector.is_open)
-        self.page.search()
+        self.page.filter()
         self.assertTrue(len(self.page.assets) == 4)
 
         self.page.category_selector.toggle()
@@ -86,7 +86,7 @@ class TestAssetList(AutoLoginTest):
         self.page.category_selector.set_option("Sound", True)
         self.page.category_selector.close()
         self.assertFalse(self.page.category_selector.is_open)
-        self.page.search()
+        self.page.filter()
         self.assertTrue(len(self.page.assets) == 2)
         asset_ids = list(map(lambda x: x.id, self.page.assets))
         self.assertEqual("1", asset_ids[0])
diff --git a/gulpfile.js b/gulpfile.js
index 404aaed5..a09f52c7 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -42,7 +42,7 @@ function styles(done) {
 function scripts() {
     const dest = 'pipeline/built_assets/js';
     const base_scripts = ["src.js", "util.js", "alert.js", "collapse.js", "dropdown.js", "modal.js", "konami.js"];
-    const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js", "autocompleter.js"]
+    const bs_select = ["bootstrap-select.js", "ajax-bootstrap-select.js"]
     return gulp.src(['node_modules/jquery/dist/jquery.js',
                     /* JQuery Plugins */
                     'node_modules/jquery-ui-dist/jquery-ui.js',
diff --git a/templates/base.html b/templates/base.html
index 858481d2..96da41d1 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -80,12 +80,7 @@
 
 <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
 <script src="{% static 'js/base.js' %}"></script>
-<script>
-if({{ request.user.dark_theme|lower|default:'false' }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
-    $('<link>').appendTo('head').attr({type : 'text/css', rel : 'stylesheet'}).attr('href', '{% static "css/dark_screen.css" %}');
-    document.body.setAttribute('data-theme', 'dark');
-}
-</script>
+{% include 'partials/dark_theme.html' %}
 {% block js %}
 {% endblock %}
 </body>
diff --git a/templates/base_embed.html b/templates/base_embed.html
index ddbc6015..e5615c20 100644
--- a/templates/base_embed.html
+++ b/templates/base_embed.html
@@ -35,12 +35,7 @@
         {% endblock %}
     </div>
 </div>
-<script>
-if({{ request.user.dark_theme|lower|default:'false' }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
-    $('<link>').appendTo('head').attr({type : 'text/css', rel : 'stylesheet'}).attr('href', '{% static "css/dark_screen.css" %}');
-    document.body.setAttribute('data-theme', 'dark');
-}
-</script>
+{% include 'partials/dark_theme.html' %}
 {% block js %}
 {% endblock %}
 </body>
diff --git a/templates/partials/dark_theme.html b/templates/partials/dark_theme.html
new file mode 100644
index 00000000..57d50dbf
--- /dev/null
+++ b/templates/partials/dark_theme.html
@@ -0,0 +1,7 @@
+{% load static %}
+<script>
+if({{ request.user.dark_theme|lower|default:'false' }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    $('<link>').prependTo('head').attr({type : 'text/css', rel : 'stylesheet'}).attr('href', '{% static "css/dark_screen.css" %}');
+    document.body.setAttribute('data-theme', 'dark');
+}
+</script>