fixed datepicker issues