diff --git a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx
index 1daf2a4c59b70..80fc2aa223fdf 100644
--- a/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx
+++ b/datahub-web-react/src/app/entity/shared/components/styled/search/EmbeddedListSearchResults.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Pagination, Typography } from 'antd';
+import { Pagination, Spin, Typography } from 'antd';
 import { LoadingOutlined } from '@ant-design/icons';
 import styled from 'styled-components';
 import { FacetFilterInput, FacetMetadata, SearchResults as SearchResultType } from '../../../../../../types.generated';
@@ -61,7 +61,7 @@ const LoadingContainer = styled.div`
 `;
 
 const StyledLoading = styled(LoadingOutlined)`
-    font-size: 36px;
+    font-size: 32px;
     color: ${ANTD_GRAY[7]};
     padding-bottom: 18px;
 ]`;
@@ -128,7 +128,7 @@ export const EmbeddedListSearchResults = ({
                 <ResultContainer>
                     {loading && (
                         <LoadingContainer>
-                            <StyledLoading />
+                            <Spin indicator={<StyledLoading />} />
                         </LoadingContainer>
                     )}
                     {!loading && (
diff --git a/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx b/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx
index 9d84de0c21172..3b7f0e48ecdf4 100644
--- a/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx
+++ b/datahub-web-react/src/app/lineage/LineageLoadingSection.tsx
@@ -1,5 +1,6 @@
 import * as React from 'react';
 import styled from 'styled-components';
+import { Spin } from 'antd';
 import { LoadingOutlined } from '@ant-design/icons';
 import { ANTD_GRAY } from '../entity/shared/constants';
 
@@ -13,7 +14,7 @@ const Container = styled.div`
 `;
 
 const StyledLoading = styled(LoadingOutlined)`
-    font-size: 36px;
+    font-size: 32px;
     color: ${ANTD_GRAY[7]};
     padding-bottom: 18px;
 ]`;
@@ -21,7 +22,7 @@ const StyledLoading = styled(LoadingOutlined)`
 export default function LineageLoadingSection() {
     return (
         <Container>
-            <StyledLoading />
+            <Spin indicator={<StyledLoading />} />
         </Container>
     );
 }
diff --git a/datahub-web-react/src/graphql/domain.graphql b/datahub-web-react/src/graphql/domain.graphql
index 951b93fcba9af..170a5b5df476b 100644
--- a/datahub-web-react/src/graphql/domain.graphql
+++ b/datahub-web-react/src/graphql/domain.graphql
@@ -27,9 +27,7 @@ query getDomain($urn: String!) {
                 }
             }
         }
-        children: relationships(input: { types: ["IsPartOf"], direction: INCOMING, start: 0, count: 0 }) {
-            total
-        }
+        ...domainEntitiesFields
     }
 }
 
diff --git a/datahub-web-react/src/graphql/lineage.graphql b/datahub-web-react/src/graphql/lineage.graphql
index dc511ca411e8d..4e9b8aacfcfa1 100644
--- a/datahub-web-react/src/graphql/lineage.graphql
+++ b/datahub-web-react/src/graphql/lineage.graphql
@@ -164,6 +164,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         domain {
             ...entityDomain
         }
+        parentContainers {
+              ...parentContainersFields
+        }
         ...entityDataProduct
         status {
             removed
@@ -188,6 +191,9 @@ fragment lineageNodeProperties on EntityWithRelationships {
         ownership {
             ...ownershipFields
         }
+        parentContainers {
+              ...parentContainersFields
+        }
         subTypes {
             typeNames
         }
@@ -361,6 +367,60 @@ fragment partialLineageResults on EntityLineageResult {
     filtered
 }
 
+fragment entityLineage on Entity {
+    urn
+    type
+    ...lineageNodeProperties
+    ...canEditLineageFragment
+    ... on Dataset {
+        schemaMetadata(version: 0) @include(if: $showColumns) {
+            ...schemaMetadataFields
+        }
+        siblings {
+            isPrimary
+            siblings {
+                urn
+                type
+                ... on Dataset {
+                    exists
+                }
+                ...lineageNodeProperties
+            }
+        }
+    }
+    ... on Chart {
+        inputFields @include(if: $showColumns) {
+            ...inputFieldsFields
+        }
+    }
+    ... on EntityWithRelationships {
+        upstream: lineage(
+            input: {
+                direction: UPSTREAM
+                start: 0
+                count: 100
+                separateSiblings: $separateSiblings
+                startTimeMillis: $startTimeMillis
+                endTimeMillis: $endTimeMillis
+            }
+        ) @skip(if: $excludeUpstream) {
+            ...fullLineageResults
+        }
+        downstream: lineage(
+            input: {
+                direction: DOWNSTREAM
+                start: 0
+                count: 100
+                separateSiblings: $separateSiblings
+                startTimeMillis: $startTimeMillis
+                endTimeMillis: $endTimeMillis
+            }
+        ) @skip(if: $excludeDownstream) {
+            ...fullLineageResults
+        }
+    }
+}
+
 query getEntityLineage(
     $urn: String!
     $separateSiblings: Boolean
@@ -371,57 +431,21 @@ query getEntityLineage(
     $excludeDownstream: Boolean = false
 ) {
     entity(urn: $urn) {
-        urn
-        type
-        ...lineageNodeProperties
-        ...canEditLineageFragment
-        ... on Dataset {
-            schemaMetadata(version: 0) @include(if: $showColumns) {
-                ...schemaMetadataFields
-            }
-            siblings {
-                isPrimary
-                siblings {
-                    urn
-                    type
-                    ... on Dataset {
-                        exists
-                    }
-                    ...lineageNodeProperties
-                }
-            }
-        }
-        ... on Chart {
-            inputFields @include(if: $showColumns) {
-                ...inputFieldsFields
-            }
-        }
-        ... on EntityWithRelationships {
-            upstream: lineage(
-                input: {
-                    direction: UPSTREAM
-                    start: 0
-                    count: 100
-                    separateSiblings: $separateSiblings
-                    startTimeMillis: $startTimeMillis
-                    endTimeMillis: $endTimeMillis
-                }
-            ) @skip(if: $excludeUpstream) {
-                ...fullLineageResults
-            }
-            downstream: lineage(
-                input: {
-                    direction: DOWNSTREAM
-                    start: 0
-                    count: 100
-                    separateSiblings: $separateSiblings
-                    startTimeMillis: $startTimeMillis
-                    endTimeMillis: $endTimeMillis
-                }
-            ) @skip(if: $excludeDownstream) {
-                ...fullLineageResults
-            }
-        }
+      ...entityLineage
+    }
+}
+
+query getBulkEntityLineage(
+    $urns: [String!]!,
+    $separateSiblings: Boolean
+    $showColumns: Boolean!
+    $startTimeMillis: Long
+    $endTimeMillis: Long
+    $excludeUpstream: Boolean = false
+    $excludeDownstream: Boolean = false
+) {
+    entities(urns: $urns) {
+        ...entityLineage
     }
 }
 
@@ -489,3 +513,44 @@ query getLineageCounts(
         }
     }
 }
+
+query getSearchAcrossLineageCounts(
+    $urn: String!
+    $excludeUpstream: Boolean = false
+    $excludeDownstream: Boolean = false
+) {
+    upstreams: searchAcrossLineage(
+        input: {
+            urn: $urn
+            query: "*"
+            start: 0
+            count: 10000
+            filters: [{ field: "degree", value: "1", values: ["1"] }]
+            direction: UPSTREAM
+        }
+    ) @skip(if: $excludeUpstream) {
+        start
+        count
+        total
+        facets {
+            ...facetFields
+        }
+    }
+    downstreams: searchAcrossLineage(
+        input: {
+            urn: $urn
+            query: "*"
+            start: 0
+            count: 10000
+            filters: [{ field: "degree", value: "1", values: ["1"] }]
+            direction: DOWNSTREAM
+        }
+    ) @skip(if: $excludeDownstream) {
+        start
+        count
+        total
+        facets {
+            ...facetFields
+        }
+    }
+}
\ No newline at end of file
diff --git a/datahub-web-react/src/graphql/query.graphql b/datahub-web-react/src/graphql/query.graphql
index 84908b24f9ae7..e24c12a4448b1 100644
--- a/datahub-web-react/src/graphql/query.graphql
+++ b/datahub-web-react/src/graphql/query.graphql
@@ -1,3 +1,13 @@
+query getQuery($urn: String!) {
+    entity(urn: $urn) {
+        urn
+        type
+        ... on QueryEntity {
+            ...query
+        }
+    }
+}
+
 fragment query on QueryEntity {
     urn
     properties {
diff --git a/metadata-models/src/main/pegasus/com/linkedin/query/QueryProperties.pdl b/metadata-models/src/main/pegasus/com/linkedin/query/QueryProperties.pdl
index 3ba19d348913b..9587775dbed3a 100644
--- a/metadata-models/src/main/pegasus/com/linkedin/query/QueryProperties.pdl
+++ b/metadata-models/src/main/pegasus/com/linkedin/query/QueryProperties.pdl
@@ -1,6 +1,7 @@
 namespace com.linkedin.query
 
 import com.linkedin.common.AuditStamp
+import com.linkedin.common.Urn
 
 /**
  * Information about a Query against one or more data assets (e.g. Tables or Views).
@@ -22,7 +23,11 @@ record QueryProperties {
     /**
      * The query was entered manually by a user (via the UI).
      */
-    MANUAL
+    MANUAL,
+    /**
+     * The query was discovered by a crawler.
+     */
+    SYSTEM
   }
 
   /**