Fixed #23009: Shorten FK identifiers in add_field and make consistent