Make time slot validation smarter #3