Fixes to the pagination
Merge pull request #2430 from ten24/feature-4-pagination

Fixes to the pagination