Fixed date filter issue