Improve time selection.