diff --git a/src/sql/base/browser/ui/table/media/slickColorTheme.css b/src/sql/base/browser/ui/table/media/slickColorTheme.css
index d527387cbe..dee9cc4f2c 100644
--- a/src/sql/base/browser/ui/table/media/slickColorTheme.css
+++ b/src/sql/base/browser/ui/table/media/slickColorTheme.css
@@ -22,6 +22,8 @@
 .resultsMessageValue a:link {
 	color: var(--color-grid-link);
 	text-decoration: underline;
+	cursor: pointer;
+	white-space: inherit;
 }
 
 .slick-cell a:hover,
diff --git a/src/sql/workbench/contrib/query/browser/gridPanel.ts b/src/sql/workbench/contrib/query/browser/gridPanel.ts
index 1e19798714..19862f500a 100644
--- a/src/sql/workbench/contrib/query/browser/gridPanel.ts
+++ b/src/sql/workbench/contrib/query/browser/gridPanel.ts
@@ -77,7 +77,7 @@ const MIN_GRID_HEIGHT = (MIN_GRID_HEIGHT_ROWS * ROW_HEIGHT) + HEADER_HEIGHT + ES
 // performant than trying to parse the string to object.
 // Regex explaination: after removing the trailing whitespaces, the string must start with '[' (to support arrays)
 // or '{'. And there must be a '}' to match the '{'.
-const IsJsonRegex = /^\s*\[*\s*{.*?}/g;
+const IsJsonRegex = /({(.|\s)*?})|(\[(.|\s)*?\])/g;
 
 export class GridPanel extends Disposable {
 	private container = document.createElement('div');