Issue #23487:conditionally exclude inactive items in new mode only