Fixed duplication of surveys after update. Major fixes.