Review logic on controls

[ntruong18]

All controls with the loop within a loop with an exit condition should be reviewed to update the logic to ensure we have the best approach. List of controls V-55949 V-55951 V-56027 V-55945 V-55989