fix vendor id & handlers for marketplace