Fix filtering and sorting for Order Panel
Revert "Fix filtering and sorting for Order Panel"

This reverts commit db9e9a8febf040532c66429dd5d19c50aa29dc03.