Issue #22081:add edit to prevent over application of target apopen