And more work on date filtering