small update to entity and the index.