PIM-2184 : ensure properties are always in product result record
PIM-2184 : fix the field sorter