diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts
index e65ffae17..6af824080 100644
--- a/packages/types/dbinfo.d.ts
+++ b/packages/types/dbinfo.d.ts
@@ -190,10 +190,6 @@ export interface DatabaseInfo extends DatabaseInfoObjects {
   engine?: string;
 }
 
-type DeepPartial<T> = {
-  [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
-};
-
 export interface ColumnReferenceTiny {
   n: string; // name
   r?: string; // ref name
@@ -217,6 +213,8 @@ export interface TableInfoTiny {
   n: string; //name
   o: string; // comment
   c: ColumnInfoTiny[]; // columns
+  p?: PrimaryKeyInfoTiny; // primary key
+  f?: ForeignKeyInfoTiny[]; // foreign keys
 }
 
 export interface DatabaseInfoTiny {
diff --git a/packages/web/src/celldata/JsonCellView.svelte b/packages/web/src/celldata/JsonCellView.svelte
index f9589a6fe..ea9633c33 100644
--- a/packages/web/src/celldata/JsonCellView.svelte
+++ b/packages/web/src/celldata/JsonCellView.svelte
@@ -5,6 +5,7 @@
 
   export let selection;
   export let showWholeRow = false;
+  export let expandAll = false;
 
   let json = null;
   let error = null;
@@ -31,7 +32,7 @@
 {:else}
   <div class="outer">
     <div class="inner">
-      <JSONTree value={json} expanded />
+      <JSONTree value={json} {expandAll} expanded />
     </div>
   </div>
 {/if}
diff --git a/packages/web/src/celldata/JsonExpandedCellView.svelte b/packages/web/src/celldata/JsonExpandedCellView.svelte
new file mode 100644
index 000000000..db38ad001
--- /dev/null
+++ b/packages/web/src/celldata/JsonExpandedCellView.svelte
@@ -0,0 +1,6 @@
+<script lang="ts">
+  import JsonCellView from './JsonCellView.svelte';
+  export let selection;
+</script>
+
+<JsonCellView {selection} expandAll />
diff --git a/packages/web/src/widgets/CellDataWidget.svelte b/packages/web/src/widgets/CellDataWidget.svelte
index 367948296..eb64a0c8d 100644
--- a/packages/web/src/widgets/CellDataWidget.svelte
+++ b/packages/web/src/widgets/CellDataWidget.svelte
@@ -20,6 +20,12 @@
       component: JsonCellView,
       single: true,
     },
+    {
+      type: 'jsonExpanded',
+      title: 'Json - expanded',
+      component: JsonExpandedCellView,
+      single: true,
+    },
     {
       type: 'jsonRow',
       title: 'Json - Row',
@@ -84,6 +90,7 @@
   import SelectField from '../forms/SelectField.svelte';
   import { selectedCellsCallback } from '../stores';
   import WidgetTitle from './WidgetTitle.svelte';
+  import JsonExpandedCellView from '../celldata/JsonExpandedCellView.svelte';
 
   let selectedFormatType = 'autodetect';