namePart element indexing improvements