Some survey editing bugs fixed