Change the way we do date filtering