diff --git a/tournaments/admin.py b/tournaments/admin.py
index e93fdfc..4678f32 100644
--- a/tournaments/admin.py
+++ b/tournaments/admin.py
@@ -60,7 +60,7 @@ class TeamRegistrationAdmin(admin.ModelAdmin):
 class TeamScoreAdmin(admin.ModelAdmin):
     list_display = ['team_registration', 'score', 'walk_out', 'match']
     list_filter = [TeamScoreTournamentListFilter]
-    search_fields = ['id', 'licence_id', 'first_name', 'last_name']
+    search_fields = ['id']
 
 class RoundAdmin(admin.ModelAdmin):
     list_display = ['tournament', 'name', 'index', 'parent']
@@ -70,7 +70,7 @@ class RoundAdmin(admin.ModelAdmin):
 
 class PlayerRegistrationAdmin(admin.ModelAdmin):
     list_display = ['first_name', 'last_name', 'licence_id', 'rank']
-    search_fields = ('first_name', 'last_name')
+    search_fields = ('first_name', 'last_name', 'licence_id__icontains')
     list_filter = ['registered_online', TeamScoreTournamentListFilter]
     ordering = ['last_name', 'first_name']