Updated Surveys works correctly now