Fixed regression: Reduce number of manual tick box actions

Why is this change being made?

!44624 (merged) was partially reverted by accident in !44593 (b9bbe5d8)

This MR fixes these issues

Does this MR meet the acceptance criteria?

Assign to DRI

• Did you assign this change to the correct DRI of the page or information you are changing?

Conformity

• Added description to this MR explaining the reasons for the proposed change, per say-why-not-just-what