Revert "fix OBOE"

This reverts commit 6aa504a1b514b9c517a2a9036a72d3bcec1fdcb8.
The commit did not actually fix the problem, but rather introduced
issues elsewhere.
fix pagination issue
Merge pull request #111 from satta/pagination

Pagination