Fix issue with list values in metadata