diff --git a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java
index 3bffe3a36d..520ae25d8f 100644
--- a/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java
+++ b/src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java
@@ -71,6 +71,23 @@ if(!supervisorName.toString().isEmpty()) {
         orderBy__.append(orderBy);
     }
 
+    private List<Employee> addEmployeesToList(final StringBuffer supervisorName, List<Employee> employeeList) {
+        if(supervisorName.toString().isEmpty()) {
+            return employeeList;
+        } else {
+            List<Employee> employeeListName = new ArrayList<Employee>();
+            for(Employee employee : employeeList) {
+                if(employee.getNameAsString().equals(supervisorName.toString())) {
+                    employeeListName.add(employee);
+                }
+            }
+            if(!employeeListName.isEmpty()) {
+                return employeeListName;
+            }
+        }
+        return employeeList;
+    }
+
 	private void setUpTable(final Dialog dialog, final WebMarkupContainer tableContainer, final StringBuffer supervisorName) {
         final StringBuffer sortDirection = new StringBuffer();
         final StringBuffer orderBy = new StringBuffer();
@@ -88,19 +105,9 @@ if(!supervisorName.toString().isEmpty()) {
                 } else {
                     sorter = new org.springframework.data.domain.Sort(org.springframework.data.domain.Sort.Direction.DESC, orderBy.toString());
                 }
-
                 List<Employee> employeeList = new ArrayList<Employee>();
                 employeeList.addAll(supervisorService.findAllEmployees(sorter));
-                if(!supervisorName.toString().isEmpty()) {
-                    List<Employee> employeeListName = new ArrayList<Employee>();
-                    for(Employee employee : employeeList) {
-                        if(employee.getNameAsString().equals(supervisorName.toString())) {
-                            employeeListName.add(employee);
-                        }
-                    }
-                    return  employeeListName;
-                }
-                return employeeList;
+                return addEmployeesToList(supervisorName, employeeList);
             }
         }) {