UI-789: Handle case when removing default options and adding new ones under the same object