Fix gh#77 search and paging issue

Fixes #77