Added DateFilter, small refactoring