PIM-1113: Clean choice rendering for alias and connector