Doctrine sorter and filter fix
Doctrine sorter tests
Doctrine sorter test
Refactored