Added check that date is selected