Added parent and student filters