PIM-2184: fix product field sorters