Add pagination to agreements
Fix typo and solve merge conflict