Changed signature of search to return request and results
Adding facet support