Fixed issue with switch connection types and services.