[WIP] Search Changes 2 - Refactor ElasticSearchResults class