diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementViewActive.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementViewActive.ejs
new file mode 100644
index 0000000000..fc1927dab2
--- /dev/null
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementViewActive.ejs
@@ -0,0 +1,8 @@
+<script id="queryManagementViewActive.ejs" type="text/template">
+  <div class="headerBar">
+    <a class="arangoHeader">Query Management</a>
+  </div>
+
+  <div id="queryManagementContent" class="innerContent">
+  </div>
+</script>
diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementViewSlow.ejs
similarity index 61%
rename from js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementView.ejs
rename to js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementViewSlow.ejs
index a1fea0d9ef..f853a43b9d 100644
--- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementView.ejs
+++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/queryManagementViewSlow.ejs
@@ -1,12 +1,3 @@
-<script id="queryManagementViewActive.ejs" type="text/template">
-  <div class="headerBar">
-    <a class="arangoHeader">Query Management</a>
-  </div>
-
-  <div id="queryManagementContent" class="innerContent">
-  </div>
-</script>
-
 <script id="queryManagementViewSlow.ejs" type="text/template">
   <div class="headerBar">
     <a class="arangoHeader">Query Management</a>
diff --git a/js/apps/system/_admin/aardvark/APP/test/karma/files_orig.json b/js/apps/system/_admin/aardvark/APP/test/karma/files_orig.json
index 47da3d28b3..451080383b 100755
--- a/js/apps/system/_admin/aardvark/APP/test/karma/files_orig.json
+++ b/js/apps/system/_admin/aardvark/APP/test/karma/files_orig.json
@@ -107,6 +107,7 @@
     "frontend/js/models/graph.js",
     "frontend/js/models/notification.js",
     "frontend/js/models/arangoQuery.js",
+    "frontend/js/models/queryManagement.js",
     "clusterFrontend/js/models/clusterServer.js",
     "clusterFrontend/js/models/clusterCoordinator.js",
     "clusterFrontend/js/models/clusterDatabase.js",
@@ -131,6 +132,8 @@
     "frontend/js/collections/graphCollection.js",
     "frontend/js/collections/notificationCollection.js",
     "frontend/js/collections/arangoQueries.js",
+    "frontend/js/collections/queryManagementCollectionActive.js",
+    "frontend/js/collections/queryManagementCollectionSlow.js",
     "clusterFrontend/js/collections/_automaticRetryCollection.js",
     "clusterFrontend/js/collections/clusterServers.js",
     "clusterFrontend/js/collections/clusterCoordinators.js",
@@ -169,6 +172,7 @@
     "frontend/js/views/userBarView.js",
     "frontend/js/views/userManagementView.js",
     "frontend/js/views/progressView.js",
+    "frontend/js/views/queryManagementView.js",
 
     "clusterFrontend/js/views/clusterDownView.js",
     "clusterFrontend/js/views/loginModalView.js",