Fixing issues
related to importing and saving surveys