Add index on name fields