Separate Datasets and Dataset collections

[wagner-d]

Collections of multiple datasets are currently treated the same as single datasets and use inconsistent indexing variables.