Improve date select sort