Fix issue with ordering information when loading data from yaml source