Fix validation as a result of upstream changes
Change date to DateRange and the standard validations