Improved Sorter and Filter