Bug 22413: Improve query string and desc creation for Elasticsearch