Filtering and Sorting moved from DataQueryBuilder into subinterfaces