Improve date selectors. Closes #46