Timetabling Feature; Remove past courses

We are moving to using the timetabling function for our short courses. In the template options it will list all courses regardless if the date has passed or the status of the course. 

Can you please investigate either removing the short course if the date has passed or if the course status has changed to completed or cancelled or inactive. 

Thanks