PIM-3224 : update product query factory and product datasource