Fixed conflict when tracking and uploading surveys.