Move search to HttpHandler