We now iterate over the mapping rather than this custom `getIndexedFields` (which gave us a value that didn't really match the correct mapping).