diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py
index 6a84fdbaedd87f98c85cfb09854bb908b54dbcd8..74cb7eb26942ed151343751ddd5be4f4c05e24d8 100644
--- a/biscuit/apps/alsijil/forms.py
+++ b/biscuit/apps/alsijil/forms.py
@@ -33,6 +33,14 @@ class SelectForm(forms.Form):
     group = forms.ModelChoiceField(
         queryset=Group.objects.annotate(lessons_count=Count('lessons')).filter(lessons_count__gt=0),
         label=_('Group'), required=False)
+    teacher = forms.ModelChoiceField(
+        queryset=Person.objects.annotate(lessons_count=Count(
+            'lessons')).filter(lessons_count__gt=0),
+        label=_('Teacher'), required=False)
+    room = forms.ModelChoiceField(
+        queryset=Room.objects.annotate(lessons_count=Count(
+            'lesson_periods')).filter(lessons_count__gt=0),
+        label=_('Room'), required=False)
 
 
 PersonalNoteFormSet = forms.modelformset_factory(