Don't overwrite the whole fieldmap so autocomplete names are resolved correctly