Concerns sorter

Just replace some sorters by an MEntity sorter.

This pull request needs #522 to be merged.