Merge fixed for products and views