Added/fixed support for Sunday daytime shuttle