Few more improvements for ontology and ElasticSearch indexing!