Added id to entities while loading from elasticsearch