Add calendar date query and day selection