Fixed time filtering bugs