diff --git a/datahub-web-react/src/Mocks.tsx b/datahub-web-react/src/Mocks.tsx
index de471b6b9f2fb..aed672a34e7ca 100644
--- a/datahub-web-react/src/Mocks.tsx
+++ b/datahub-web-react/src/Mocks.tsx
@@ -1254,6 +1254,7 @@ export const glossaryNode5 = {
 
 export const sampleTag = {
     urn: 'urn:li:tag:abc-sample-tag',
+    type: EntityType.Tag,
     name: 'abc-sample-tag',
     description: 'sample tag description',
     ownership: {
diff --git a/datahub-web-react/src/graphql/container.graphql b/datahub-web-react/src/graphql/container.graphql
index 749c1c9172b6d..4b3ecfe8aaaff 100644
--- a/datahub-web-react/src/graphql/container.graphql
+++ b/datahub-web-react/src/graphql/container.graphql
@@ -1,6 +1,7 @@
 query getContainer($urn: String!) {
     container(urn: $urn) {
         urn
+        type
         exists
         lastIngested
         platform {
diff --git a/datahub-web-react/src/graphql/dashboard.graphql b/datahub-web-react/src/graphql/dashboard.graphql
index 68a966a68e00a..681c98f361ccb 100644
--- a/datahub-web-react/src/graphql/dashboard.graphql
+++ b/datahub-web-react/src/graphql/dashboard.graphql
@@ -1,5 +1,7 @@
 query getDashboard($urn: String!) {
     dashboard(urn: $urn) {
+        urn
+        type
         ...dashboardFields
         privileges {
             ...entityPrivileges
diff --git a/datahub-web-react/src/graphql/dataJob.graphql b/datahub-web-react/src/graphql/dataJob.graphql
index 78247bd460fbb..836aac35deaf5 100644
--- a/datahub-web-react/src/graphql/dataJob.graphql
+++ b/datahub-web-react/src/graphql/dataJob.graphql
@@ -1,5 +1,7 @@
 query getDataJob($urn: String!) {
     dataJob(urn: $urn) {
+        urn
+        type
         ...dataJobFields
         privileges {
             ...entityPrivileges
diff --git a/datahub-web-react/src/graphql/dataPlatform.graphql b/datahub-web-react/src/graphql/dataPlatform.graphql
index 6281cf155a5d2..44acbf6737fae 100644
--- a/datahub-web-react/src/graphql/dataPlatform.graphql
+++ b/datahub-web-react/src/graphql/dataPlatform.graphql
@@ -1,5 +1,7 @@
 query getDataPlatform($urn: String!) {
     dataPlatform(urn: $urn) {
+        urn
+        type
         ...platformFields
     }
 }
diff --git a/datahub-web-react/src/graphql/dataProduct.graphql b/datahub-web-react/src/graphql/dataProduct.graphql
index eb053ca956131..623ece13dbfc1 100644
--- a/datahub-web-react/src/graphql/dataProduct.graphql
+++ b/datahub-web-react/src/graphql/dataProduct.graphql
@@ -1,5 +1,7 @@
 query getDataProduct($urn: String!) {
     dataProduct(urn: $urn) {
+        urn
+        type
         ...dataProductFields
         privileges {
             ...entityPrivileges
diff --git a/datahub-web-react/src/graphql/dataset.graphql b/datahub-web-react/src/graphql/dataset.graphql
index 1ca25a6ba3bf6..fcca919f61423 100644
--- a/datahub-web-react/src/graphql/dataset.graphql
+++ b/datahub-web-react/src/graphql/dataset.graphql
@@ -1,6 +1,7 @@
 query getDataProfiles($urn: String!, $limit: Int, $startTime: Long, $endTime: Long) {
     dataset(urn: $urn) {
         urn
+        type
         datasetProfiles(limit: $limit, startTimeMillis: $startTime, endTimeMillis: $endTime) {
             rowCount
             columnCount
diff --git a/datahub-web-react/src/graphql/mlFeature.graphql b/datahub-web-react/src/graphql/mlFeature.graphql
index d6a75e16b86f1..2ed5ecfb37fda 100644
--- a/datahub-web-react/src/graphql/mlFeature.graphql
+++ b/datahub-web-react/src/graphql/mlFeature.graphql
@@ -1,5 +1,7 @@
 query getMLFeature($urn: String!) {
     mlFeature(urn: $urn) {
+        urn
+        type
         ...nonRecursiveMLFeature
         privileges {
             ...entityPrivileges
diff --git a/datahub-web-react/src/graphql/mlFeatureTable.graphql b/datahub-web-react/src/graphql/mlFeatureTable.graphql
index a6e069c120518..02efbaf9766e1 100644
--- a/datahub-web-react/src/graphql/mlFeatureTable.graphql
+++ b/datahub-web-react/src/graphql/mlFeatureTable.graphql
@@ -1,5 +1,7 @@
 query getMLFeatureTable($urn: String!) {
     mlFeatureTable(urn: $urn) {
+        urn
+        type
         ...nonRecursiveMLFeatureTable
         privileges {
             ...entityPrivileges
diff --git a/datahub-web-react/src/graphql/mlModel.graphql b/datahub-web-react/src/graphql/mlModel.graphql
index 1626bc473213a..2192888caef70 100644
--- a/datahub-web-react/src/graphql/mlModel.graphql
+++ b/datahub-web-react/src/graphql/mlModel.graphql
@@ -1,5 +1,7 @@
 query getMLModel($urn: String!) {
     mlModel(urn: $urn) {
+        urn
+        type
         ...nonRecursiveMLModel
         features: relationships(input: { types: ["Consumes"], direction: OUTGOING, start: 0, count: 100 }) {
             start
diff --git a/datahub-web-react/src/graphql/mlModelGroup.graphql b/datahub-web-react/src/graphql/mlModelGroup.graphql
index 8ae049c8c0b1d..81ab65d0b9a08 100644
--- a/datahub-web-react/src/graphql/mlModelGroup.graphql
+++ b/datahub-web-react/src/graphql/mlModelGroup.graphql
@@ -1,5 +1,7 @@
 query getMLModelGroup($urn: String!) {
     mlModelGroup(urn: $urn) {
+        urn
+        type
         ...nonRecursiveMLModelGroupFields
         incoming: relationships(
             input: {
diff --git a/datahub-web-react/src/graphql/mlPrimaryKey.graphql b/datahub-web-react/src/graphql/mlPrimaryKey.graphql
index 599c4d7fabcac..d39f9d3fbdfa2 100644
--- a/datahub-web-react/src/graphql/mlPrimaryKey.graphql
+++ b/datahub-web-react/src/graphql/mlPrimaryKey.graphql
@@ -1,5 +1,7 @@
 query getMLPrimaryKey($urn: String!) {
     mlPrimaryKey(urn: $urn) {
+        urn
+        type
         ...nonRecursiveMLPrimaryKey
         privileges {
             ...entityPrivileges
diff --git a/datahub-web-react/src/graphql/tag.graphql b/datahub-web-react/src/graphql/tag.graphql
index 031d923276bfe..0bf0953b15fbe 100644
--- a/datahub-web-react/src/graphql/tag.graphql
+++ b/datahub-web-react/src/graphql/tag.graphql
@@ -1,6 +1,7 @@
 query getTag($urn: String!) {
     tag(urn: $urn) {
         urn
+        type
         name
         description
         properties {
diff --git a/datahub-web-react/src/graphql/user.graphql b/datahub-web-react/src/graphql/user.graphql
index a8a4e90284956..030ef85df7124 100644
--- a/datahub-web-react/src/graphql/user.graphql
+++ b/datahub-web-react/src/graphql/user.graphql
@@ -1,6 +1,7 @@
 query getUser($urn: String!, $groupsCount: Int!) {
     corpUser(urn: $urn) {
         urn
+        type
         username
         isNativeUser
         exists