#472 Added todo
#472 updated comment
#472 Corrected nesting config so that contents of metadatafields are not affected