* Fixed keyword search when using ElasticSearch