more work done regarding the mappings of entities in ElasticSearch