ore efficient filtering + bug fix in discussion/lecture filter