Improve course filtering