Make SearchCommons work nicely with ElasticSearch package