diff --git a/server/rooms/admin.py b/server/rooms/admin.py
index 128859ef..179d619a 100644
--- a/server/rooms/admin.py
+++ b/server/rooms/admin.py
@@ -6,7 +6,10 @@ from rooms.models import Room, RoomEntry, ModuleRoomSlug
 @admin.register(Room)
 class RoomAdmin(admin.ModelAdmin):
     list_display = ('id', 'slug', 'title', 'school_class', 'appearance')
-    list_filter = ('school_class', 'appearance')
+    list_filter = (
+                      ('school_class', admin.RelatedOnlyFieldListFilter),
+    )
+    search_fields = ('slug', 'title')
 
 
 @admin.register(RoomEntry)