Fix issue with company name in address