Added terms and query combination for ElasticQuery