Swap $filter for filterFilter and orderByFilter