Connection selector rework