Improve date range filter