SearchServlet reworked