[bug 993650] Update the product picker