diff --git a/src/components/SearchContainer/Tabs/AZManagementGroupNodeData.jsx b/src/components/SearchContainer/Tabs/AZManagementGroupNodeData.jsx
index ed8f16d27..361fa3035 100644
--- a/src/components/SearchContainer/Tabs/AZManagementGroupNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/AZManagementGroupNodeData.jsx
@@ -106,13 +106,21 @@ const AZManagementGroupNodeData = ({}) => {
 
                 <hr></hr>
 
-                <CollapsibleSection header='DESCENDENT OBJECTS'>
+                <CollapsibleSection header='DESCENDANT OBJECTS'>
                     <div className={styles.itemlist}>
                         <Table>
                             <thead></thead>
                             <tbody className='searchable'>
                                 <NodeCypherLink
-                                    property='Total Subscriptions'
+                                    property='Total Management Groups'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZManagementGroup)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Subscription Objects'
                                     target={objectid}
                                     baseQuery={
                                         'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZSubscription)'
@@ -120,7 +128,7 @@ const AZManagementGroupNodeData = ({}) => {
                                     distinct
                                 />
                                 <NodeCypherLink
-                                    property='Total Resource Groups'
+                                    property='Total Resource Group Objects'
                                     target={objectid}
                                     baseQuery={
                                         'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZResourceGroup)'
@@ -128,10 +136,26 @@ const AZManagementGroupNodeData = ({}) => {
                                     distinct
                                 />
                                 <NodeCypherLink
-                                    property='Total VM Objects'
+                                    property='Total Automation Account Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZAutomationAccount)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Container Registry Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZContainerRegistry)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Function App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZFunctionApp)'
                                     }
                                     distinct
                                 />
@@ -143,6 +167,46 @@ const AZManagementGroupNodeData = ({}) => {
                                     }
                                     distinct
                                 />
+                                <NodeCypherLink
+                                    property='Total Logic App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZLogicApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Managed Cluster Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZManagedCluster)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Scale Set Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZVMScaleSet)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Web App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZManagementGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZWebApp)'
+                                    }
+                                    distinct
+                                />
                             </tbody>
                         </Table>
                     </div>
diff --git a/src/components/SearchContainer/Tabs/AZResourceGroupNodeData.jsx b/src/components/SearchContainer/Tabs/AZResourceGroupNodeData.jsx
index 8f8cd31a0..548f66289 100644
--- a/src/components/SearchContainer/Tabs/AZResourceGroupNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/AZResourceGroupNodeData.jsx
@@ -74,26 +74,81 @@ const AZResourceGroupNodeData = () => {
 
                 <hr></hr>
 
-                <CollapsibleSection header='DESCENDENT OBJECTS'>
+                <CollapsibleSection header='DESCENDANT OBJECTS'>
                     <div className={styles.itemlist}>
                         <Table>
                             <thead></thead>
                             <tbody className='searchable'>
                                 <NodeCypherLink
-                                    property='Descendent VMs'
+                                    property='Total Automation Account Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p = (g:AZResourceGroup {objectid: $objectid})-[r:AZContains]->(n:AZVM)'
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZAutomationAccount)'
                                     }
-                                    end={label}
+                                    distinct
                                 />
                                 <NodeCypherLink
-                                    property='Descendent KeyVaults'
+                                    property='Total Container Registry Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p = (g:AZResourceGroup {objectid: $objectid})-[r:AZContains]->(n:AZKeyVault)'
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZContainerRegistry)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Function App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZFunctionApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Key Vault Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZKeyVault)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Logic App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZLogicApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Managed Cluster Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZManagedCluster)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Scale Set Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZVMScaleSet)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Web App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZResourceGroup {objectid: $objectid})-[r:AZContains*1..]->(n:AZWebApp)'
                                     }
-                                    end={label}
                                     distinct
                                 />
                             </tbody>
diff --git a/src/components/SearchContainer/Tabs/AZSubscriptionNodeData.jsx b/src/components/SearchContainer/Tabs/AZSubscriptionNodeData.jsx
index 2e00152ab..85146a3b0 100644
--- a/src/components/SearchContainer/Tabs/AZSubscriptionNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/AZSubscriptionNodeData.jsx
@@ -104,24 +104,40 @@ const AZSubscriptionNodeData = () => {
 
                 <hr></hr>
 
-                <CollapsibleSection header='DESCENDENT OBJECTS'>
+                <CollapsibleSection header='DESCENDANT OBJECTS'>
                     <div className={styles.itemlist}>
                         <Table>
                             <thead></thead>
                             <tbody className='searchable'>
                                 <NodeCypherLink
-                                    property='Total VM Objects'
+                                    property='Total Resource Group Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZResourceGroup)'
                                     }
                                     distinct
                                 />
                                 <NodeCypherLink
-                                    property='Total Resource Group Objects'
+                                    property='Total Automation Account Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZResourceGroup)'
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZAutomationAccount)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Container Registry Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZContainerRegistry)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Function App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZFunctionApp)'
                                     }
                                     distinct
                                 />
@@ -133,6 +149,46 @@ const AZSubscriptionNodeData = () => {
                                     }
                                     distinct
                                 />
+                                <NodeCypherLink
+                                    property='Total Logic App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZLogicApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Managed Cluster Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZManagedCluster)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Scale Set Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZVMScaleSet)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Web App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZSubscription {objectid: $objectid})-[r:AZContains*1..]->(n:AZWebApp)'
+                                    }
+                                    distinct
+                                />
                             </tbody>
                         </Table>
                     </div>
diff --git a/src/components/SearchContainer/Tabs/AZTenantNodeData.jsx b/src/components/SearchContainer/Tabs/AZTenantNodeData.jsx
index effdb9c9e..f7fe9b427 100644
--- a/src/components/SearchContainer/Tabs/AZTenantNodeData.jsx
+++ b/src/components/SearchContainer/Tabs/AZTenantNodeData.jsx
@@ -89,18 +89,18 @@ const AZTenantNodeData = () => {
                             <thead></thead>
                             <tbody className='searchable'>
                                 <NodeCypherLink
-                                    property='Subscriptions'
+                                    property='Total Management Groups'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZSubscription)'
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZManagementGroup)'
                                     }
                                     distinct
                                 />
                                 <NodeCypherLink
-                                    property='Total VM Objects'
+                                    property='Total Subscription Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZSubscription)'
                                     }
                                     distinct
                                 />
@@ -112,6 +112,30 @@ const AZTenantNodeData = () => {
                                     }
                                     distinct
                                 />
+                                <NodeCypherLink
+                                    property='Total Automation Account Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZAutomationAccount)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Container Registry Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZContainerRegistry)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Function App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZFunctionApp)'
+                                    }
+                                    distinct
+                                />
                                 <NodeCypherLink
                                     property='Total Key Vault Objects'
                                     target={objectid}
@@ -121,10 +145,58 @@ const AZTenantNodeData = () => {
                                     distinct
                                 />
                                 <NodeCypherLink
-                                    property='Total User Objects'
+                                    property='Total Logic App Objects'
                                     target={objectid}
                                     baseQuery={
-                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZUser)'
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZLogicApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Managed Cluster Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZManagedCluster)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZVM)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total VM Scale Set Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZVMScaleSet)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Web App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZWebApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total App Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZApp)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Device Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZDevice)'
                                     }
                                     distinct
                                 />
@@ -136,6 +208,30 @@ const AZTenantNodeData = () => {
                                     }
                                     distinct
                                 />
+                                <NodeCypherLink
+                                    property='Total Role Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZRole)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total Service Principal Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZServicePrincipal)'
+                                    }
+                                    distinct
+                                />
+                                <NodeCypherLink
+                                    property='Total User Objects'
+                                    target={objectid}
+                                    baseQuery={
+                                        'MATCH p=(o:AZTenant {objectid: $objectid})-[r:AZContains*1..]->(n:AZUser)'
+                                    }
+                                    distinct
+                                />
                             </tbody>
                         </Table>
                     </div>