pagination 404 drying
Merge pull request #195 from Petercopter/pagination-fixes

pagination 404 drying