Date filtering added
- Further refactoring is needed