PIM-1420 : fix product creation and completeness calculation