Changes which should fix survey editing