Fix default connection selection