fixed fetch metadata mappings