[OE-3659] fixed add-all and remove-all