diff --git a/website/public/styles/adminpanel.css b/website/public/styles/adminpanel.css
index 0648118..39d823f 100644
--- a/website/public/styles/adminpanel.css
+++ b/website/public/styles/adminpanel.css
@@ -56,5 +56,5 @@
 }
 
 .bancommentform input[type="text"] {
-    width: 100%;
+    width: 80%;
 }
\ No newline at end of file
diff --git a/website/queries/group_page.php b/website/queries/group_page.php
index 511ff4d..588e2fd 100644
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -193,7 +193,9 @@ function search20GroupsFromNByStatus($n, $keyword, $status) {
     return $q;
 }
 
-function searchSomeGroupsByStatus($n, $m, $keyword, $status) {
+function searchSomeGroupsByStatus($n, $m, $search, $status) {
+//    parentheses not needed in where clause, for clarity as
+//      role search should override status filter.
     $q = prepareQuery("
     SELECT
         `groupID`,
@@ -203,16 +205,18 @@ function searchSomeGroupsByStatus($n, $m, $keyword, $status) {
     FROM
         `group_page`
     WHERE
-        `name` LIKE :keyword AND
-        FIND_IN_SET (`status`, :statuses)
+        (`name` LIKE :keyword AND
+        FIND_IN_SET (`status`, :statuses)) OR 
+        `status` = :search
     ORDER BY
         `name`
     LIMIT
         :n, :m
     ");
 
-    $keyword = "%$keyword%";
+    $keyword = "%$search%";
     $q->bindParam(':keyword', $keyword);
+    $q->bindParam(':search', $search);
     $q->bindParam(':n', $n, PDO::PARAM_INT);
     $q->bindParam(':m', $m, PDO::PARAM_INT);
     $statuses = implode(',', $status);
@@ -221,21 +225,23 @@ function searchSomeGroupsByStatus($n, $m, $keyword, $status) {
     return $q;
 }
 
-function countSomeGroupsByStatus($keyword, $status) {
+function countSomeGroupsByStatus($search, $status) {
     $q = prepareQuery("
     SELECT
         COUNT(*)
     FROM
         `group_page`
     WHERE
-        `name` LIKE :keyword AND
-        FIND_IN_SET (`status`, :statuses)
+        (`name` LIKE :keyword AND
+        FIND_IN_SET (`status`, :statuses)) OR 
+        `status` = :search
     ORDER BY
         `name`
     ");
 
-    $keyword = "%$keyword%";
+    $keyword = "%$search%";
     $q->bindParam(':keyword', $keyword);
+    $q->bindParam(':search', $search);
     $statuses = implode(',', $status);
     $q->bindParam(':statuses', $statuses);
     $q->execute();
diff --git a/website/queries/user.php b/website/queries/user.php
index 33a85a1..f7d8abe 100644
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -205,7 +205,9 @@ function search20UsersFromNByStatus($n, $keyword, $status) {
     return $q;
 }
 
-function searchSomeUsersByStatus($n, $m, $keyword, $status) {
+function searchSomeUsersByStatus($n, $m, $search, $status) {
+//    parentheses not needed in where clause, for clarity as
+//      role search should override status filter.
     $q = prepareQuery("
     SELECT
         `userID`,
@@ -219,8 +221,9 @@ function searchSomeUsersByStatus($n, $m, $keyword, $status) {
     FROM
         `user`
     WHERE
-        `username` LIKE :keyword AND
-        FIND_IN_SET (`role`, :statuses)
+        (`username` LIKE :keyword AND
+        FIND_IN_SET (`role`, :statuses)) OR 
+        `role` = :search
     ORDER BY
         `role`,
         `username`
@@ -228,8 +231,9 @@ function searchSomeUsersByStatus($n, $m, $keyword, $status) {
         :n, :m
     ");
 
-    $keyword = "%$keyword%";
+    $keyword = "%$search%";
     $q->bindParam(':keyword', $keyword);
+    $q->bindParam(':search', $search);
     $q->bindParam(':n', $n, PDO::PARAM_INT);
     $q->bindParam(':m', $m, PDO::PARAM_INT);
     $statuses = implode(',', $status);
@@ -238,22 +242,24 @@ function searchSomeUsersByStatus($n, $m, $keyword, $status) {
     return $q;
 }
 
-function countSomeUsersByStatus($keyword, $status) {
+function countSomeUsersByStatus($search, $status) {
     $q = prepareQuery("
     SELECT
         COUNT(*)
     FROM
         `user`
     WHERE
-        `username` LIKE :keyword AND
-        FIND_IN_SET (`role`, :statuses)
+        (`username` LIKE :keyword AND
+        FIND_IN_SET (`role`, :statuses)) OR 
+        `role` = :search
     ORDER BY
         `role`,
         `username`
     ");
 
-    $keyword = "%$keyword%";
+    $keyword = "%$search%";
     $q->bindParam(':keyword', $keyword);
+    $q->bindParam(':search', $search);
     $statuses = implode(',', $status);
     $q->bindParam(':statuses', $statuses);
     $q->execute();