Fixed issue with date filter