Add time table link and change ON conditions