PIM-2374 : update value sorter and add related spec