#358 - Fix filtering/sorting/paging for various scenarios