Pagination: fixed to work with API client