PIM-3250 : add checks in product query utility