Elasticsearch suggestion refactoring