Improve date selection