PIM-2902: Fix sorters
PIM-2902: Simplify is_associated sorter