Refactor/searcher

``per_page`` is not set here?