Fixed issue: Surveys not ordered by name
Dev Reduced memory usage at token export