Concerns sorter

Just replace some sorters by an MEntity sorter.