Fix single choice selection handling