Improve general performance of time selection.