CMS-4242 Improve DataSet toMap - Let single value also be wrapped in a List