Updated TODO-list, SearchServlet, little changes