The handling of data in the filter string has been separated to its own method.

src/main/java/se/su/dsv/scipro/admin/panels/match/AdminSupervisorKeywordPanel.java

@@ -72,19 +72,15 @@ if(!supervisorName.toString().isEmpty()) {
     }
 
     private List<Employee> addEmployeesToList(final StringBuffer supervisorName, List<Employee> employeeList) {
-        if(supervisorName.toString().isEmpty()) {
+        List<Employee> employeeListName = new ArrayList<Employee>();
-            return employeeList;
+        for(Employee employee : employeeList) {
-        } else {
+            if(employee.getNameAsString().equals(supervisorName.toString())) {
-            List<Employee> employeeListName = new ArrayList<Employee>();
+                employeeListName.add(employee);
-            for(Employee employee : employeeList) {
-                if(employee.getNameAsString().equals(supervisorName.toString())) {
-                    employeeListName.add(employee);
-                }
-            }
-            if(!employeeListName.isEmpty()) {
-                return employeeListName;
             }
         }
+        if(!employeeListName.isEmpty()) {
+            return employeeListName;
+        }
         return employeeList;
     }
 
@@ -107,6 +103,9 @@ if(!supervisorName.toString().isEmpty()) {
                 }
                 List<Employee> employeeList = new ArrayList<Employee>();
                 employeeList.addAll(supervisorService.findAllEmployees(sorter));
+                if(supervisorName.toString().isEmpty()) {
+                    return employeeList;
+                }
                 return addEmployeesToList(supervisorName, employeeList);
             }
         }) {