diff --git a/package.json b/package.json
index 223afe4b38..36e485970e 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "angular2-grid": "2.0.6",
     "ansi_up": "^3.0.0",
     "applicationinsights": "1.0.8",
-    "azdataGraph": "github:Microsoft/azdataGraph#0.0.14",
+    "azdataGraph": "github:Microsoft/azdataGraph#0.0.16",
     "chart.js": "^2.9.4",
     "chokidar": "3.5.2",
     "graceful-fs": "4.2.6",
diff --git a/remote/package.json b/remote/package.json
index 4c4a5f58b4..1c8947221e 100644
--- a/remote/package.json
+++ b/remote/package.json
@@ -16,7 +16,7 @@
     "applicationinsights": "1.0.8",
     "angular2-grid": "2.0.6",
     "ansi_up": "^3.0.0",
-    "azdataGraph": "github:Microsoft/azdataGraph#0.0.14",
+    "azdataGraph": "github:Microsoft/azdataGraph#0.0.16",
     "chart.js": "^2.9.4",
     "chokidar": "3.5.2",
     "cookie": "^0.4.0",
diff --git a/remote/web/package.json b/remote/web/package.json
index 10078d9481..e43be512c3 100644
--- a/remote/web/package.json
+++ b/remote/web/package.json
@@ -15,7 +15,7 @@
 		"@vscode/vscode-languagedetection": "1.0.18",
 		"angular2-grid": "2.0.6",
 		"ansi_up": "^3.0.0",
-		"azdataGraph": "github:Microsoft/azdataGraph#0.0.14",
+		"azdataGraph": "github:Microsoft/azdataGraph#0.0.16",
 		"chart.js": "^2.9.4",
 		"gridstack": "^3.1.3",
 		"kburtram-query-plan": "2.6.1",
diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock
index 342ba29ee7..8a4bcae0bb 100644
--- a/remote/web/yarn.lock
+++ b/remote/web/yarn.lock
@@ -150,9 +150,9 @@ array-uniq@^1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-"azdataGraph@github:Microsoft/azdataGraph#0.0.14":
-  version "0.0.14"
-  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/1fba9e94e5520ef78121f6dc23a5a2cdee20c8a4"
+"azdataGraph@github:Microsoft/azdataGraph#0.0.16":
+  version "0.0.16"
+  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/0b6cc39bef9550860c46511b0ccf3c7ac277b73c"
 
 chalk@^2.3.0, chalk@^2.4.1:
   version "2.4.2"
diff --git a/remote/yarn.lock b/remote/yarn.lock
index d5ec23bb21..87936e1eac 100644
--- a/remote/yarn.lock
+++ b/remote/yarn.lock
@@ -198,9 +198,9 @@ array-uniq@^1.0.2:
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-"azdataGraph@github:Microsoft/azdataGraph#0.0.14":
-  version "0.0.14"
-  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/1fba9e94e5520ef78121f6dc23a5a2cdee20c8a4"
+"azdataGraph@github:Microsoft/azdataGraph#0.0.16":
+  version "0.0.16"
+  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/0b6cc39bef9550860c46511b0ccf3c7ac277b73c"
 
 binary-extensions@^2.0.0:
   version "2.0.0"
diff --git a/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts b/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts
index 5552139685..2afeea7d25 100644
--- a/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts
+++ b/src/sql/workbench/contrib/queryplan2/browser/queryPlan.ts
@@ -38,6 +38,7 @@ import { IFileService } from 'vs/platform/files/common/files';
 import { VSBuffer } from 'vs/base/common/buffer';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { URI } from 'vs/base/common/uri';
+import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService';
 
 let azdataGraph = azdataGraphModule();
 
@@ -165,7 +166,8 @@ export class QueryPlan2 implements ISashLayoutProvider {
 		@IContextMenuService private _contextMenuService: IContextMenuService,
 		@IFileDialogService public fileDialogService: IFileDialogService,
 		@IFileService public fileService: IFileService,
-		@IWorkspaceContextService public workspaceContextService: IWorkspaceContextService
+		@IWorkspaceContextService public workspaceContextService: IWorkspaceContextService,
+		@ITextResourcePropertiesService private readonly textResourcePropertiesService: ITextResourcePropertiesService
 	) {
 		// parent container for query plan.
 		this._container = DOM.$('.query-plan');
@@ -281,7 +283,8 @@ export class QueryPlan2 implements ISashLayoutProvider {
 	}
 
 	private populate(node: InternalExecutionPlanNode, diagramNode: any): any {
-		diagramNode.label = node.name;
+		diagramNode.label = node.subtext.join(this.textResourcePropertiesService.getEOL(undefined));
+		diagramNode.tooltipTitle = node.name;
 		const nodeId = this.createGraphElementId();
 		diagramNode.id = nodeId;
 		node.id = nodeId;
diff --git a/yarn.lock b/yarn.lock
index 976e943ef4..e390d6930f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1831,9 +1831,9 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
-"azdataGraph@github:Microsoft/azdataGraph#0.0.14":
-  version "0.0.14"
-  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/1fba9e94e5520ef78121f6dc23a5a2cdee20c8a4"
+"azdataGraph@github:Microsoft/azdataGraph#0.0.16":
+  version "0.0.16"
+  resolved "https://codeload.github.com/Microsoft/azdataGraph/tar.gz/0b6cc39bef9550860c46511b0ccf3c7ac277b73c"
 
 azure-storage@^2.10.2:
   version "2.10.2"