Merge pull request #22947 from ruchamahabal/escape-company-field

fix: escape company field