date filter fixes