ISSUE=8047 tightened up add and completion interaction