PIM-3320: clean context from product query builder api