Fix ElasticSearch model mappings