diff --git a/src/main/java/nl/tudelft/ewi/queue/model/Request.java b/src/main/java/nl/tudelft/ewi/queue/model/Request.java
index 50529f006e0f1c40bd3ae59aefa3767ffd6f23ce..7c9805bd8dd1e6b094a430e3a011ccb315cfd9bb 100644
--- a/src/main/java/nl/tudelft/ewi/queue/model/Request.java
+++ b/src/main/java/nl/tudelft/ewi/queue/model/Request.java
@@ -608,10 +608,14 @@ public class Request implements RecordsEvents<Request>, Serializable, Comparable
 		CANCELLED,
 		NOTFOUND {
 			@Override
-			public String toString() {
+			public String displayName() {
 				return "NOT FOUND";
 			}
 		};
+
+		public String displayName() {
+			return name();
+		}
 	}
 
 	public String toSentence() {
diff --git a/src/main/resources/templates/request/list/filters.html b/src/main/resources/templates/request/list/filters.html
index 225d1e9f2562ab1f84a70e1a208db5838b27b48a..3ed8a62700a1a968f9dbc5ceb597fe2ff3a8d719 100644
--- a/src/main/resources/templates/request/list/filters.html
+++ b/src/main/resources/templates/request/list/filters.html
@@ -115,7 +115,7 @@
                 <label class="form-control-label" for="statusSelect">Status</label>
                 <select multiple class="selectpicker" id="statusSelect" name="status">
                     <th:block th:each="status : ${T(nl.tudelft.ewi.queue.model.Request.Status).values()}">
-                        <option th:value="${status}" th:text="${status}"
+                        <option th:value="${status}" th:text="${status.displayName()}"
                                 th:selected="${#filter.valueInMultiMap('status', status, state)}"></option>
                     </th:block>
                 </select>
diff --git a/src/main/resources/templates/request/list/requesttable.html b/src/main/resources/templates/request/list/requesttable.html
index b4246e7b423bfe7e639891187bea1cff0d78bf85..630102018f8dd69476465f2bcaec184a8e07f872 100644
--- a/src/main/resources/templates/request/list/requesttable.html
+++ b/src/main/resources/templates/request/list/requesttable.html
@@ -40,7 +40,7 @@
     </tr>
     <th:block th:each="request : ${requests.content}">
         <tr class="text-white" th:classappend="${#filter.mapStatusToBootstrapColor(request.status)}" th:id="'request-' + ${request.id}">
-            <td><span class="badge badge-pill bg-info" th:text="${request.status}" th:id="'status-' + ${request.id}"></span></td>
+            <td><span class="badge badge-pill bg-info" th:text="${request.status.displayName()}" th:id="'status-' + ${request.id}"></span></td>
             <td><a href="#" class="text-white" th:href="@{/request/{id}(id=${request.id})}"
                    th:text="${request.toSentence()}">
                 Request
@@ -65,4 +65,4 @@
     </tbody>
 </table>
 </body>
-</html>
\ No newline at end of file
+</html>