diff --git a/website/public/js/admin.js b/website/public/js/admin.js
new file mode 100644
index 0000000..2055123
--- /dev/null
+++ b/website/public/js/admin.js
@@ -0,0 +1,44 @@
+window.onload = function() {
+    changeFilter();
+};
+
+function checkAll(allbox) {
+    var checkboxes = document.getElementsByClassName('checkbox-list');
+
+    for (var i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') {
+            checkboxes[i].checked = allbox.checked;
+        }
+    }
+}
+
+function checkCheckAll(allbox) {
+    var checkboxes = document.getElementsByClassName('checkbox-list');
+    var checked = true;
+
+    for (var i = 0; i < checkboxes.length; i++) {
+        if (checkboxes[i].type == 'checkbox') {
+            if (checkboxes[i].checked == false) {
+                checked = false;
+                break;
+            }
+        }
+    }
+    allbox.checked = checked;
+}
+
+function changeFilter() {
+    if (document.getElementById('group').checked) {
+        document.getElementById('admin-filter').style.display = 'none';
+        document.getElementById('admin-groupfilter').style.display = 'inline-block';
+
+        document.getElementById('admin-batchactions').style.display = 'none';
+        document.getElementById('admin-groupbatchactions').style.display = 'inline-block';
+    } else {
+        document.getElementById('admin-filter').style.display = 'inline-block';
+        document.getElementById('admin-groupfilter').style.display = 'none';
+
+        document.getElementById('admin-batchactions').style.display = 'inline-block';
+        document.getElementById('admin-groupbatchactions').style.display = 'none';
+    }
+}
diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index af23dae..fde8237 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -3,53 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Admin Panel</title>
-    <script type="text/javascript">
-    window.onload = function() {
-        changeFilter();
-    };
-
-    function checkAll(allbox) {
-        var checkboxes = document.getElementsByClassName('checkbox-list');
-
-        for (var i = 0; i < checkboxes.length; i++) {
-            if (checkboxes[i].type == 'checkbox') {
-                checkboxes[i].checked = allbox.checked;
-            }
-        }
-    }
-
-    function checkCheckAll(allbox) {
-        var checkboxes = document.getElementsByClassName('checkbox-list');
-        var checked = true;
-
-        for (var i = 0; i < checkboxes.length; i++) {
-            if (checkboxes[i].type == 'checkbox') {
-                if (checkboxes[i].checked == false) {
-                    checked = false;
-                    break;
-                }
-            }
-        }
-        allbox.checked = checked;
-    }
-
-    function changeFilter() {
-        if (document.getElementById('group').checked) {
-            document.getElementById('admin-filter').style.display = 'none';
-            document.getElementById('admin-groupfilter').style.display = 'inline-block';
-
-            document.getElementById('admin-batchactions').style.display = 'none';
-            document.getElementById('admin-groupbatchactions').style.display = 'inline-block';
-        } else {
-            document.getElementById('admin-filter').style.display = 'inline-block';
-            document.getElementById('admin-groupfilter').style.display = 'none';
-
-            document.getElementById('admin-batchactions').style.display = 'inline-block';
-            document.getElementById('admin-groupbatchactions').style.display = 'none';
-        }
-    }
-
-    </script>
+    <script src="../public/js/admin.js" charset="utf-8"></script>
     <?php
         include_once("../queries/user.php");
         include_once("../queries/group_page.php");
@@ -228,7 +182,7 @@ function test_input($data) {
                         if ($pagetype == "user") {
                             $pages = countSomeUsersByStatus($search, $status);
                         } else {
-                            $pages = countSomeGroupsByStatus($search, $status);
+                            $pages = countSomeGroupsByStatus($search, $groupstatus);
                         }
                         $countresults = $pages->fetchColumn();
                         $mincount = min($listm, $countresults);
