refactored date filter
m
m