Improved date filter