diff --git a/evennia/comms/admin.py b/evennia/comms/admin.py
index 52ed7993fd..fde7cc4c42 100644
--- a/evennia/comms/admin.py
+++ b/evennia/comms/admin.py
@@ -53,10 +53,11 @@ class ChannelAdmin(admin.ModelAdmin):
     list_display = ('id', 'db_key', 'db_lock_storage', "subscriptions")
     list_display_links = ("id", 'db_key')
     ordering = ["db_key"]
-    search_fields = ['id', 'db_key', 'db_aliases']
+    search_fields = ['id', 'db_key', 'db_tags__db_key']
     save_as = True
     save_on_top = True
     list_select_related = True
+    raw_id_fields = ('db_object_subscriptions', 'db_account_subscriptions',)
     fieldsets = (
         (None, {'fields': (('db_key',), 'db_lock_storage', 'db_account_subscriptions', 'db_object_subscriptions')}),
     )