Issue #8309 by cableman: Tried to fix time filtering