MLD-28567 calendar: improved course filter process