Ashwin | #2582 | Refactoring date filters.