timetable now query optimised