Fix dateselect