Analytics Data Service Impl. Update. Refactoring search result implementation, indexing