Improved handling of single-date selection