Fix: sorting; Refactoring MngrQuerys