diff --git a/questionnaire/admin.py b/questionnaire/admin.py
index 1216add..7060208 100644
--- a/questionnaire/admin.py
+++ b/questionnaire/admin.py
@@ -61,7 +61,7 @@ class RunInfoHistoryAdmin(admin.ModelAdmin):
     pass
 
 class AnswerAdmin(admin.ModelAdmin):
-    search_fields = ['subject', 'runid', 'question', 'answer']
+    search_fields = ['subject__email', 'runid', 'question__number', 'answer']
     list_display = ['runid', 'subject', 'question']
     list_filter = ['subject', 'runid']
     ordering = [ 'subject', 'runid', 'question', ]