Fix SearchPager bugs, improve test coverage