Rivers pagination fix
Fixes for pagination
Merge pull request #155 from gajdaw/fixes-for-pagination

Fixes for pagination