Fixed default field mapping from metadata