Product Picker fix for new product api