Fix errors from using published dataset names
Merge pull request #6429 from hroskes/fix-dataset-error-73X

Fix errors from using published datasets