PIM-2374 : update completeness sorter and add spec