Restrict shop_vendors to their own products more consistentnly

Addresses #2477