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

Backport of #6429: Fix errors from using published datasets