Add proper result processing
Add facets support