CAL-254 upate select date, fix bug on udpate time