Fix time_filter_helper merge, more [Fixes #60985000]