some tweak in Datepicker helper