PIM-3371 : re-work product query command