Add/ rename should fill in combo item if only one choice exists

[saulgreenberg]

I just can't remember what aspect of the system this concerned, so I am leaving it alone.