Datepicker within period fixes