Fine tune selected date issue