Fix handling of & signs and others in manufacturer names