Update filtering
Consolidate filter, sort and paginate