Improved survey backup and restore