Continued trying to get date filtering to work as expected.