Move a bit of code around, ensure the connection name is url decoded and also let's ensure the connection parameter isn't lost when the URL is changed