diff --git a/Powershell/Lists/Azure/ServiceBus.ps1 b/Powershell/Lists/Azure/ServiceBus.ps1
index a5aa6b0..e70e175 100644
--- a/Powershell/Lists/Azure/ServiceBus.ps1
+++ b/Powershell/Lists/Azure/ServiceBus.ps1
@@ -14,12 +14,6 @@ class ResourceCheck {
     [string] $ResourceGroup = ""
     [string] $RespourceType = ""
     [string] $Location = ""
-    [string] $Tag_Team = ""
-    [string] $Tag_Product = ""
-    [string] $Tag_Environment = ""
-    [string] $Tag_Data = ""
-    [string] $Tag_Deployment = ""
-    [string] $Tag_CreatedOnDate = ""
     [string] $ServiceBusName = ""
     [string] $TopicName = ""
     [string] $TopicSubscriptionName = ""
@@ -65,12 +59,6 @@ foreach ($managementGroup in $managementGroups) {
             $resourceCheck.ResourceGroup = $servicebus.ResourceGroupName
             $resourceCheck.RespourceType = $servicebus.Type
             $resourceCheck.Location = $servicebus.Location
-            $resourceCheck.Tag_Team = $servicebus.Tags.team
-            $resourceCheck.Tag_Product = $servicebus.Tags.product
-            $resourceCheck.Tag_Environment = $servicebus.Tags.environment
-            $resourceCheck.Tag_Data = $servicebus.Tags.data
-            $resourceCheck.Tag_CreatedOnDate = $servicebus.Tags.CreatedOnDate
-            $resourceCheck.Tag_Deployment = $servicebus.Tags.drp_deployment
             $resourceCheck.ServiceBusName = $servicebus.Name
             $Result += $resourceCheck
 
@@ -85,7 +73,7 @@ foreach ($managementGroup in $managementGroups) {
                 $resourceCheck.SubscriptionId = $subscription.Id
                 $resourceCheck.SubscriptionName = $subscription.DisplayName
                 $resourceCheck.ResourceGroup = $servicebus.ResourceGroupName
-                $resourceCheck.RespourceType = $servicebus.Type
+                $resourceCheck.RespourceType = $topic.Type
                 $resourceCheck.Location = $servicebus.Location
                 $resourceCheck.ServiceBusName = $servicebus.Name
                 $resourceCheck.TopicName = $topic.Name
@@ -103,7 +91,7 @@ foreach ($managementGroup in $managementGroups) {
                     $resourceCheck.SubscriptionId = $subscription.Id
                     $resourceCheck.SubscriptionName = $subscription.DisplayName
                     $resourceCheck.ResourceGroup = $servicebus.ResourceGroupName
-                    $resourceCheck.RespourceType = $servicebus.Type
+                    $resourceCheck.RespourceType = $topicSub.Type
                     $resourceCheck.Location = $servicebus.Location
                     $resourceCheck.ServiceBusName = $servicebus.Name
                     $resourceCheck.TopicName = $topic.Name
@@ -124,7 +112,7 @@ foreach ($managementGroup in $managementGroups) {
                 $resourceCheck.SubscriptionId = $subscription.Id
                 $resourceCheck.SubscriptionName = $subscription.DisplayName
                 $resourceCheck.ResourceGroup = $servicebus.ResourceGroupName
-                $resourceCheck.RespourceType = $servicebus.Type
+                $resourceCheck.RespourceType = $queue.Type
                 $resourceCheck.Location = $servicebus.Location
                 $resourceCheck.ServiceBusName = $servicebus.Name
                 $resourceCheck.QueueName = $queue.Name