Use numeric vendor ID instead of grepping