Date filtering now working