Apply improvements in timetable.js v2 although minor