Skip logic is deleted when re-rendering and option labels multiply on edit