fix useless paramter for entity
Merge branch 'datastore-entity-index' into dev