Some more work on the date filtering