Resolves the internal errors casued when time filters are applied along ...

Kindly review and commit