ElasticSearch Index/Query Regexp Support

Imports cleanup.