diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue
index 345d6202b04..004480a1846 100644
--- a/ui/src/components/view/ListView.vue
+++ b/ui/src/components/view/ListView.vue
@@ -23,7 +23,7 @@
     :dataSource="items"
     :rowKey="record => record.id || record.name"
     :pagination="false"
-    :rowSelection="['vm', 'event', 'alert'].includes($route.name) ? {selectedRowKeys: selectedRowKeys, onChange: onSelectChange} : null"
+    :rowSelection="['vm-tbd', 'event-tbd', 'alert-tbd'].includes($route.name) ? {selectedRowKeys: selectedRowKeys, onChange: onSelectChange} : null"
     :rowClassName="getRowClassName"
     style="overflow-y: auto"
   >
diff --git a/ui/src/components/view/ResourceView.vue b/ui/src/components/view/ResourceView.vue
index d2fdf0c6ba0..d0d68d07286 100644
--- a/ui/src/components/view/ResourceView.vue
+++ b/ui/src/components/view/ResourceView.vue
@@ -107,7 +107,12 @@ export default {
     },
     showHideTab (tab) {
       if ('networkServiceFilter' in tab) {
-        if (this.resource.virtualmachineid && tab.name !== 'Firewall') return false
+        if (this.resource.virtualmachineid && tab.name !== 'Firewall') {
+          return false
+        }
+        if (this.resource && this.resource.vpcid && tab.name !== 'Firewall') {
+          return true
+        }
         return this.networkService && this.networkService.service &&
           tab.networkServiceFilter(this.networkService.service)
       } else if ('show' in tab) {
diff --git a/ui/src/config/section/network.js b/ui/src/config/section/network.js
index 6f421987b0a..8a0e9773255 100644
--- a/ui/src/config/section/network.js
+++ b/ui/src/config/section/network.js
@@ -214,7 +214,8 @@ export default {
         networkServiceFilter: networkService => networkService.filter(x => x.name === 'Lb').length > 0
       }, {
         name: 'VPN',
-        component: () => import('@/views/network/VpnDetails.vue')
+        component: () => import('@/views/network/VpnDetails.vue'),
+        show: (record) => { return record.issourcenat }
       }],
       actions: [
         {
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 3eb17fe9f33..f2ebc7e2aeb 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -781,7 +781,7 @@ export default {
                 break
               }
             }
-            if ((this.currentAction.icon === 'delete' || ['archiveEvents'].includes(this.currentAction.api)) && this.dataView) {
+            if ((this.currentAction.icon === 'delete' || ['archiveEvents', 'archiveAlerts'].includes(this.currentAction.api)) && this.dataView) {
               this.$router.go(-1)
             } else {
               if (!hasJobId) {