Fix count of search results, and update wrapper

@wheresrhys @matthew-andrews