Replace complex entity type with simple index