Search Servlet stuff
fixed up missing files in previous merge