Survey improvements
Note the issue we discovered about the database