Fixes dateselect issues