Fix Pagination with Query String

Fixes #140