(gh-17) Improved pagination with nextpage urls