#89 Rewrite search page, partial