diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 2b6056e..07d3445 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -13,12 +13,7 @@ on:
         options:
           - dev
           - test
-          - sandbox
           - prod
-      tagname:
-        description: "Specify a previous version (git tag) to deploy"
-        required: false
-        default: ""
 
 jobs:
   bus-dash-ui-cd:
diff --git a/src/components/bcros/AddressDisplay.vue b/src/components/bcros/AddressDisplay.vue
index a3fb146..3bd79cb 100644
--- a/src/components/bcros/AddressDisplay.vue
+++ b/src/components/bcros/AddressDisplay.vue
@@ -27,7 +27,7 @@ const addressData = computed((): string[] => {
     props.address.streetAddress,
     props.address.streetAdditional,
     [props.address.addressCity, props.address.addressRegion, props.address.postalCode].filter(val => !!val).join(' '),
-    getName(props.address.addressCountry)
+    getName(props.address.addressCountry) || props.address.addressCountry
   ].filter(val => !!val)
 })
 </script>