diff --git a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsSection.tsx b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsSection.tsx
index b934f150b3d7..33a1bda7e472 100644
--- a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsSection.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsSection.tsx
@@ -8,7 +8,7 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React from "react";
+import React, { useContext, useMemo } from "react";
 import classNames from "classnames/bind";
 import {
   ActiveStatement,
@@ -22,14 +22,17 @@ import { EmptyStatementsPlaceholder } from "src/statementsPage/emptyStatementsPl
 import { TableStatistics } from "src/tableStatistics";
 import {
   ISortedTablePagination,
+  SortedTable,
   SortSetting,
 } from "../sortedtable/sortedtable";
 import {
-  ActiveStatementsTable,
   getColumnOptions,
+  makeActiveStatementsColumns,
 } from "./activeStatementsTable";
 import { StatementViewType } from "src/statementsPage/statementPageTypes";
 import { calculateActiveFilters } from "src/queryFilter/filter";
+import { CockroachCloudContext } from "src/contexts";
+import { isSelectedColumn } from "src/columnsSelector/utils";
 
 const sortableTableCx = classNames.bind(sortableTableStyles);
 
@@ -58,7 +61,20 @@ export const ActiveStatementsSection: React.FC<
   onChangeSortSetting,
   onColumnsSelect,
 }) => {
-  const tableColumns: SelectOption[] = getColumnOptions(selectedColumns);
+  const isCockroachCloud = useContext(CockroachCloudContext);
+
+  const columns = useMemo(
+    () => makeActiveStatementsColumns(isCockroachCloud),
+    [isCockroachCloud],
+  );
+  const shownColumns = columns.filter(col =>
+    isSelectedColumn(selectedColumns, col),
+  );
+
+  const tableColumns: SelectOption[] = getColumnOptions(
+    columns,
+    selectedColumns,
+  );
   const activeFilters = calculateActiveFilters(filters);
 
   return (
@@ -77,9 +93,10 @@ export const ActiveStatementsSection: React.FC<
           onClearFilters={onClearFilters}
         />
       </div>
-      <ActiveStatementsTable
+      <SortedTable
+        className="statements-table"
         data={statements}
-        selectedColumns={selectedColumns}
+        columns={shownColumns}
         sortSetting={sortSetting}
         onChangeSortSetting={onChangeSortSetting}
         renderNoResult={
diff --git a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsTable/activeStatementsTable.tsx b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsTable/activeStatementsTable.tsx
index 7943c0baab2c..38890dd32ade 100644
--- a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsTable/activeStatementsTable.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeStatementsTable/activeStatementsTable.tsx
@@ -9,32 +9,20 @@
 // licenses/APL.txt.
 
 import React from "react";
-import {
-  SortedTable,
-  ISortedTablePagination,
-  ColumnDescriptor,
-} from "../../sortedtable";
-import { SortSetting } from "../../sortedtable";
-import { ActiveStatement, ExecutionType } from "../types";
+import { Link } from "react-router-dom";
 import { isSelectedColumn } from "../../columnsSelector/utils";
+import { ColumnDescriptor } from "../../sortedtable";
 import {
-  getLabel,
-  ExecutionsColumn,
   activeStatementColumnsFromCommon,
+  ExecutionsColumn,
   executionsTableTitles,
+  getLabel,
 } from "../execTableCommon";
-import { Link } from "react-router-dom";
-
-interface ActiveStatementsTable {
-  data: ActiveStatement[];
-  sortSetting: SortSetting;
-  onChangeSortSetting: (ss: SortSetting) => void;
-  pagination: ISortedTablePagination;
-  renderNoResult?: React.ReactNode;
-  selectedColumns: string[];
-}
+import { ActiveStatement } from "../types";
 
-export function makeActiveStatementsColumns(): ColumnDescriptor<ActiveStatement>[] {
+export function makeActiveStatementsColumns(
+  isCockroachCloud: boolean,
+): ColumnDescriptor<ActiveStatement>[] {
   return [
     activeStatementColumnsFromCommon.executionID,
     {
@@ -50,15 +38,18 @@ export function makeActiveStatementsColumns(): ColumnDescriptor<ActiveStatement>
     activeStatementColumnsFromCommon.status,
     activeStatementColumnsFromCommon.startTime,
     activeStatementColumnsFromCommon.elapsedTime,
-    activeStatementColumnsFromCommon.timeSpentWaiting,
+    !isCockroachCloud
+      ? activeStatementColumnsFromCommon.timeSpentWaiting
+      : null,
     activeStatementColumnsFromCommon.applicationName,
-  ];
+  ].filter(col => col != null);
 }
 
 export function getColumnOptions(
+  columns: ColumnDescriptor<ActiveStatement>[],
   selectedColumns: string[] | null,
 ): { label: string; value: string; isSelected: boolean }[] {
-  return makeActiveStatementsColumns()
+  return columns
     .filter(col => !col.alwaysShow)
     .map(col => ({
       value: col.name,
@@ -66,16 +57,3 @@ export function getColumnOptions(
       isSelected: isSelectedColumn(selectedColumns, col),
     }));
 }
-
-export const ActiveStatementsTable: React.FC<ActiveStatementsTable> = props => {
-  const { selectedColumns, ...rest } = props;
-  const columns = makeActiveStatementsColumns().filter(col =>
-    isSelectedColumn(selectedColumns, col),
-  );
-
-  return (
-    <SortedTable columns={columns} className="statements-table" {...rest} />
-  );
-};
-
-ActiveStatementsTable.defaultProps = {};
diff --git a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsSection.tsx b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsSection.tsx
index a287ad5f6a6a..d97b0559a0f4 100644
--- a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsSection.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsSection.tsx
@@ -8,7 +8,7 @@
 // by the Apache License, Version 2.0, included in the file
 // licenses/APL.txt.
 
-import React from "react";
+import React, { useMemo, useContext } from "react";
 import classNames from "classnames/bind";
 import {
   ActiveStatementFilters,
@@ -25,11 +25,14 @@ import {
   SortSetting,
 } from "../sortedtable/sortedtable";
 import {
-  ActiveTransactionsTable,
+  makeActiveTransactionsColumns,
   getColumnOptions,
 } from "./activeTransactionsTable";
 import { TransactionViewType } from "src/transactionsPage/transactionsPageTypes";
 import { calculateActiveFilters } from "src/queryFilter/filter";
+import { CockroachCloudContext } from "src/contexts";
+import { isSelectedColumn } from "src/columnsSelector/utils";
+import { SortedTable } from "src/sortedtable";
 
 const sortableTableCx = classNames.bind(sortableTableStyles);
 
@@ -58,7 +61,21 @@ export const ActiveTransactionsSection: React.FC<
   onClearFilters,
   onColumnsSelect,
 }) => {
-  const tableColumns: SelectOption[] = getColumnOptions(selectedColumns);
+  const isCockroachCloud = useContext(CockroachCloudContext);
+
+  const columns = useMemo(
+    () => makeActiveTransactionsColumns(isCockroachCloud),
+    [isCockroachCloud],
+  );
+  const shownColumns = columns.filter(col =>
+    isSelectedColumn(selectedColumns, col),
+  );
+
+  const tableColumns: SelectOption[] = getColumnOptions(
+    columns,
+    selectedColumns,
+  );
+
   const activeFilters = calculateActiveFilters(filters);
 
   return (
@@ -77,9 +94,9 @@ export const ActiveTransactionsSection: React.FC<
           onClearFilters={onClearFilters}
         />
       </div>
-      <ActiveTransactionsTable
+      <SortedTable
         data={transactions}
-        selectedColumns={selectedColumns}
+        columns={shownColumns}
         sortSetting={sortSetting}
         onChangeSortSetting={onChangeSortSetting}
         renderNoResult={
diff --git a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsTable/activeTransactionsTable.tsx b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsTable/activeTransactionsTable.tsx
index 339e806a8ed7..454478efaae3 100644
--- a/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsTable/activeTransactionsTable.tsx
+++ b/pkg/ui/workspaces/cluster-ui/src/activeExecutions/activeTransactionsTable/activeTransactionsTable.tsx
@@ -9,34 +9,22 @@
 // licenses/APL.txt.
 
 import React from "react";
-import {
-  SortedTable,
-  ISortedTablePagination,
-  ColumnDescriptor,
-} from "../../sortedtable";
-import { SortSetting } from "../../sortedtable";
-import { ActiveTransaction, ExecutionType } from "../types";
-import { isSelectedColumn } from "../../columnsSelector/utils";
 import { Link } from "react-router-dom";
+import { isSelectedColumn } from "../../columnsSelector/utils";
+import { ColumnDescriptor } from "../../sortedtable";
 import {
-  getLabel,
-  executionsTableTitles,
-  ExecutionsColumn,
   activeTransactionColumnsFromCommon,
+  ExecutionsColumn,
+  executionsTableTitles,
+  getLabel,
 } from "../execTableCommon";
+import { ActiveTransaction, ExecutionType } from "../types";
 
-interface ActiveTransactionsTable {
-  data: ActiveTransaction[];
-  sortSetting: SortSetting;
-  onChangeSortSetting: (ss: SortSetting) => void;
-  pagination: ISortedTablePagination;
-  renderNoResult?: React.ReactNode;
-  selectedColumns: string[];
-}
-
-export function makeActiveTransactionsColumns(): ColumnDescriptor<ActiveTransaction>[] {
+export function makeActiveTransactionsColumns(
+  isCockroachCloud: boolean,
+): ColumnDescriptor<ActiveTransaction>[] {
   const execType: ExecutionType = "transaction";
-  const columns: ColumnDescriptor<ActiveTransaction>[] = [
+  return [
     activeTransactionColumnsFromCommon.executionID,
     {
       name: "mostRecentStatement",
@@ -51,7 +39,9 @@ export function makeActiveTransactionsColumns(): ColumnDescriptor<ActiveTransact
     activeTransactionColumnsFromCommon.status,
     activeTransactionColumnsFromCommon.startTime,
     activeTransactionColumnsFromCommon.elapsedTime,
-    activeTransactionColumnsFromCommon.timeSpentWaiting,
+    !isCockroachCloud
+      ? activeTransactionColumnsFromCommon.timeSpentWaiting
+      : null,
     {
       name: "statementCount",
       title: executionsTableTitles.statementCount(execType),
@@ -65,14 +55,14 @@ export function makeActiveTransactionsColumns(): ColumnDescriptor<ActiveTransact
       sort: (item: ActiveTransaction) => item.retries,
     },
     activeTransactionColumnsFromCommon.applicationName,
-  ];
-  return columns;
+  ].filter(col => col != null);
 }
 
 export function getColumnOptions(
+  columns: ColumnDescriptor<ActiveTransaction>[],
   selectedColumns: string[] | null,
 ): { label: string; value: string; isSelected: boolean }[] {
-  return makeActiveTransactionsColumns()
+  return columns
     .filter(col => !col.alwaysShow)
     .map(col => ({
       value: col.name,
@@ -80,18 +70,3 @@ export function getColumnOptions(
       isSelected: isSelectedColumn(selectedColumns, col),
     }));
 }
-
-export const ActiveTransactionsTable: React.FC<
-  ActiveTransactionsTable
-> = props => {
-  const { selectedColumns, ...rest } = props;
-  const columns = makeActiveTransactionsColumns().filter(col =>
-    isSelectedColumn(selectedColumns, col),
-  );
-
-  return (
-    <SortedTable columns={columns} className="statements-table" {...rest} />
-  );
-};
-
-ActiveTransactionsTable.defaultProps = {};
diff --git a/pkg/ui/workspaces/cluster-ui/src/contexts/cockroachCloudContext.tsx b/pkg/ui/workspaces/cluster-ui/src/contexts/cockroachCloudContext.tsx
new file mode 100644
index 000000000000..05395c024679
--- /dev/null
+++ b/pkg/ui/workspaces/cluster-ui/src/contexts/cockroachCloudContext.tsx
@@ -0,0 +1,13 @@
+// Copyright 2022 The Cockroach Authors.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+import { createContext } from "react";
+
+export const CockroachCloudContext = createContext<boolean>(true);
diff --git a/pkg/ui/workspaces/cluster-ui/src/contexts/index.ts b/pkg/ui/workspaces/cluster-ui/src/contexts/index.ts
new file mode 100644
index 000000000000..f252008a33d3
--- /dev/null
+++ b/pkg/ui/workspaces/cluster-ui/src/contexts/index.ts
@@ -0,0 +1,11 @@
+// Copyright 2022 The Cockroach Authors.
+//
+// Use of this software is governed by the Business Source License
+// included in the file licenses/BSL.txt.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0, included in the file
+// licenses/APL.txt.
+
+export * from "./cockroachCloudContext";
diff --git a/pkg/ui/workspaces/cluster-ui/src/index.ts b/pkg/ui/workspaces/cluster-ui/src/index.ts
index 798adcbf290c..551bc580787f 100644
--- a/pkg/ui/workspaces/cluster-ui/src/index.ts
+++ b/pkg/ui/workspaces/cluster-ui/src/index.ts
@@ -51,3 +51,4 @@ export * from "./timeScaleDropdown";
 export * from "./activeExecutions";
 export * from "./graphs";
 export * from "./selectors";
+export * from "./contexts";
diff --git a/pkg/ui/workspaces/db-console/src/app.tsx b/pkg/ui/workspaces/db-console/src/app.tsx
index 004ca0dda585..3350e588c704 100644
--- a/pkg/ui/workspaces/db-console/src/app.tsx
+++ b/pkg/ui/workspaces/db-console/src/app.tsx
@@ -79,6 +79,7 @@ import ActiveTransactionDetails from "./views/transactions/activeTransactionDeta
 import "styl/app.styl";
 import { Tracez } from "src/views/tracez/tracez";
 import InsightsOverviewPage from "src/views/insights/insightsOverview";
+import { CockroachCloudContext } from "@cockroachlabs/cluster-ui";
 
 // NOTE: If you are adding a new path to the router, and that path contains any
 // components that are personally identifying information, you MUST update the
@@ -101,322 +102,332 @@ export const App: React.FC<AppProps> = (props: AppProps) => {
   return (
     <Provider store={store} context={ReactReduxContext}>
       <ConnectedRouter history={history} context={ReactReduxContext}>
-        <Switch>
-          {/* login */}
-          {createLoginRoute()}
-          {createLogoutRoute(store)}
-          <Route path="/">
-            <Layout>
-              <Switch>
-                <Redirect exact from="/" to="/overview" />
-                {/* overview page */}
-                {visualizationRoutes()}
+        <CockroachCloudContext.Provider value={false}>
+          <Switch>
+            {/* login */}
+            {createLoginRoute()}
+            {createLogoutRoute(store)}
+            <Route path="/">
+              <Layout>
+                <Switch>
+                  <Redirect exact from="/" to="/overview" />
+                  {/* overview page */}
+                  {visualizationRoutes()}
 
-                {/* time series metrics */}
-                <Redirect
-                  exact
-                  from="/metrics"
-                  to="/metrics/overview/cluster"
-                />
-                <Redirect
-                  exact
-                  from={`/metrics/:${dashboardNameAttr}`}
-                  to={`/metrics/:${dashboardNameAttr}/cluster`}
-                />
-                <Route
-                  exact
-                  path={`/metrics/:${dashboardNameAttr}/cluster`}
-                  component={NodeGraphs}
-                />
-                <Redirect
-                  exact
-                  path={`/metrics/:${dashboardNameAttr}/node`}
-                  to={`/metrics/:${dashboardNameAttr}/cluster`}
-                />
-                <Route
-                  path={`/metrics/:${dashboardNameAttr}/node/:${nodeIDAttr}`}
-                  component={NodeGraphs}
-                />
+                  {/* time series metrics */}
+                  <Redirect
+                    exact
+                    from="/metrics"
+                    to="/metrics/overview/cluster"
+                  />
+                  <Redirect
+                    exact
+                    from={`/metrics/:${dashboardNameAttr}`}
+                    to={`/metrics/:${dashboardNameAttr}/cluster`}
+                  />
+                  <Route
+                    exact
+                    path={`/metrics/:${dashboardNameAttr}/cluster`}
+                    component={NodeGraphs}
+                  />
+                  <Redirect
+                    exact
+                    path={`/metrics/:${dashboardNameAttr}/node`}
+                    to={`/metrics/:${dashboardNameAttr}/cluster`}
+                  />
+                  <Route
+                    path={`/metrics/:${dashboardNameAttr}/node/:${nodeIDAttr}`}
+                    component={NodeGraphs}
+                  />
 
-                {/* node details */}
-                <Redirect exact from="/node" to="/overview/list" />
-                <Route
-                  exact
-                  path={`/node/:${nodeIDAttr}`}
-                  component={NodeOverview}
-                />
-                <Route
-                  exact
-                  path={`/node/:${nodeIDAttr}/logs`}
-                  component={NodeLogs}
-                />
+                  {/* node details */}
+                  <Redirect exact from="/node" to="/overview/list" />
+                  <Route
+                    exact
+                    path={`/node/:${nodeIDAttr}`}
+                    component={NodeOverview}
+                  />
+                  <Route
+                    exact
+                    path={`/node/:${nodeIDAttr}/logs`}
+                    component={NodeLogs}
+                  />
 
-                {/* events & jobs */}
-                <Route path="/events" component={EventPage} />
-                <Route exact path="/jobs" component={JobsPage} />
-                <Route path={"/jobs/:id"} component={JobDetails} />
+                  {/* events & jobs */}
+                  <Route path="/events" component={EventPage} />
+                  <Route exact path="/jobs" component={JobsPage} />
+                  <Route path={"/jobs/:id"} component={JobDetails} />
 
-                {/* databases */}
-                <Route exact path="/databases" component={DatabasesPage} />
-                <Redirect exact from="/databases/tables" to="/databases" />
-                <Redirect exact from="/databases/grants" to="/databases" />
-                <Redirect
-                  from={`/databases/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
-                  to={`/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
-                />
+                  {/* databases */}
+                  <Route exact path="/databases" component={DatabasesPage} />
+                  <Redirect exact from="/databases/tables" to="/databases" />
+                  <Redirect exact from="/databases/grants" to="/databases" />
+                  <Redirect
+                    from={`/databases/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
+                    to={`/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
+                  />
 
-                <Redirect exact from="/database" to="/databases" />
-                <Route
-                  exact
-                  path={`/database/:${databaseNameAttr}`}
-                  component={DatabaseDetailsPage}
-                />
-                <Redirect
-                  exact
-                  from={`/database/:${databaseNameAttr}/table`}
-                  to={`/database/:${databaseNameAttr}`}
-                />
-                <Route
-                  exact
-                  path={`/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
-                  component={DatabaseTablePage}
-                />
-                <Route
-                  exact
-                  path={`/database/:${databaseNameAttr}/table/:${tableNameAttr}/index/:${indexNameAttr}`}
-                  component={IndexDetailsPage}
-                />
-                <Redirect
-                  exact
-                  from={`/database/:${databaseNameAttr}/table/:${tableNameAttr}/index`}
-                  to={`/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
-                />
+                  <Redirect exact from="/database" to="/databases" />
+                  <Route
+                    exact
+                    path={`/database/:${databaseNameAttr}`}
+                    component={DatabaseDetailsPage}
+                  />
+                  <Redirect
+                    exact
+                    from={`/database/:${databaseNameAttr}/table`}
+                    to={`/database/:${databaseNameAttr}`}
+                  />
+                  <Route
+                    exact
+                    path={`/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
+                    component={DatabaseTablePage}
+                  />
+                  <Route
+                    exact
+                    path={`/database/:${databaseNameAttr}/table/:${tableNameAttr}/index/:${indexNameAttr}`}
+                    component={IndexDetailsPage}
+                  />
+                  <Redirect
+                    exact
+                    from={`/database/:${databaseNameAttr}/table/:${tableNameAttr}/index`}
+                    to={`/database/:${databaseNameAttr}/table/:${tableNameAttr}`}
+                  />
 
-                {/* data distribution */}
-                <Route
-                  exact
-                  path="/data-distribution"
-                  component={DataDistributionPage}
-                />
+                  {/* data distribution */}
+                  <Route
+                    exact
+                    path="/data-distribution"
+                    component={DataDistributionPage}
+                  />
 
-                {/* SQL activity */}
-                <Route exact path="/sql-activity" component={SQLActivityPage} />
+                  {/* SQL activity */}
+                  <Route
+                    exact
+                    path="/sql-activity"
+                    component={SQLActivityPage}
+                  />
 
-                {/* Active executions */}
-                <Route
-                  exact
-                  path={`/execution/statement/:${executionIdAttr}`}
-                  component={ActiveStatementDetails}
-                />
+                  {/* Active executions */}
+                  <Route
+                    exact
+                    path={`/execution/statement/:${executionIdAttr}`}
+                    component={ActiveStatementDetails}
+                  />
 
-                <Route
-                  exact
-                  path={`/execution/transaction/:${executionIdAttr}`}
-                  component={ActiveTransactionDetails}
-                />
+                  <Route
+                    exact
+                    path={`/execution/transaction/:${executionIdAttr}`}
+                    component={ActiveTransactionDetails}
+                  />
 
-                {/* statement statistics */}
-                <Redirect
-                  exact
-                  from={`/statements`}
-                  to={`/sql-activity?${tabAttr}=Statements&${viewAttr}=fingerprints`}
-                />
-                <Redirect
-                  exact
-                  from={`/statements/:${appAttr}`}
-                  to={`/statements?${appAttr}=:${appAttr}`}
-                />
-                <Route
-                  exact
-                  path={`/statement/:${implicitTxnAttr}/:${statementAttr}`}
-                  component={StatementDetails}
-                />
-                <Route
-                  exact
-                  path={`/statements/:${appAttr}/:${statementAttr}`}
-                  render={RedirectToStatementDetails}
-                />
-                <Route
-                  exact
-                  path={`/statements/:${appAttr}/:${implicitTxnAttr}/:${statementAttr}`}
-                  render={RedirectToStatementDetails}
-                />
-                <Route
-                  exact
-                  path={`/statements/:${appAttr}/:${databaseAttr}/:${implicitTxnAttr}/:${statementAttr}`}
-                  render={RedirectToStatementDetails}
-                />
-                <Route
-                  exact
-                  path={`/statement/:${implicitTxnAttr}/:${statementAttr}`}
-                  render={RedirectToStatementDetails}
-                />
-                <Route
-                  exact
-                  path={`/statement/:${databaseAttr}/:${implicitTxnAttr}/:${statementAttr}`}
-                  render={RedirectToStatementDetails}
-                />
-                <Redirect
-                  exact
-                  from={`/statement`}
-                  to={`/sql-activity?${tabAttr}=Statements&view=fingerprints`}
-                />
+                  {/* statement statistics */}
+                  <Redirect
+                    exact
+                    from={`/statements`}
+                    to={`/sql-activity?${tabAttr}=Statements&${viewAttr}=fingerprints`}
+                  />
+                  <Redirect
+                    exact
+                    from={`/statements/:${appAttr}`}
+                    to={`/statements?${appAttr}=:${appAttr}`}
+                  />
+                  <Route
+                    exact
+                    path={`/statement/:${implicitTxnAttr}/:${statementAttr}`}
+                    component={StatementDetails}
+                  />
+                  <Route
+                    exact
+                    path={`/statements/:${appAttr}/:${statementAttr}`}
+                    render={RedirectToStatementDetails}
+                  />
+                  <Route
+                    exact
+                    path={`/statements/:${appAttr}/:${implicitTxnAttr}/:${statementAttr}`}
+                    render={RedirectToStatementDetails}
+                  />
+                  <Route
+                    exact
+                    path={`/statements/:${appAttr}/:${databaseAttr}/:${implicitTxnAttr}/:${statementAttr}`}
+                    render={RedirectToStatementDetails}
+                  />
+                  <Route
+                    exact
+                    path={`/statement/:${implicitTxnAttr}/:${statementAttr}`}
+                    render={RedirectToStatementDetails}
+                  />
+                  <Route
+                    exact
+                    path={`/statement/:${databaseAttr}/:${implicitTxnAttr}/:${statementAttr}`}
+                    render={RedirectToStatementDetails}
+                  />
+                  <Redirect
+                    exact
+                    from={`/statement`}
+                    to={`/sql-activity?${tabAttr}=Statements&view=fingerprints`}
+                  />
 
-                {/* sessions */}
-                <Redirect
-                  exact
-                  from={`/sessions`}
-                  to={`/sql-activity?${tabAttr}=Sessions`}
-                />
-                <Route
-                  exact
-                  path={`/session/:${sessionAttr}`}
-                  component={SessionDetails}
-                />
+                  {/* sessions */}
+                  <Redirect
+                    exact
+                    from={`/sessions`}
+                    to={`/sql-activity?${tabAttr}=Sessions`}
+                  />
+                  <Route
+                    exact
+                    path={`/session/:${sessionAttr}`}
+                    component={SessionDetails}
+                  />
 
-                {/* transactions */}
-                <Redirect
-                  exact
-                  from={`/transactions`}
-                  to={`/sql-activity?${tabAttr}=Transactions`}
-                />
-                <Route
-                  exact
-                  path={`/transaction/:${txnFingerprintIdAttr}`}
-                  component={TransactionDetails}
-                />
-                <Redirect
-                  exact
-                  from={`/transaction/:${aggregatedTsAttr}/:${txnFingerprintIdAttr}`}
-                  to={`/transaction/:${txnFingerprintIdAttr}`}
-                />
-                {/* Insights */}
-                <Route
-                  exact
-                  path="/insights"
-                  component={InsightsOverviewPage}
-                />
+                  {/* transactions */}
+                  <Redirect
+                    exact
+                    from={`/transactions`}
+                    to={`/sql-activity?${tabAttr}=Transactions`}
+                  />
+                  <Route
+                    exact
+                    path={`/transaction/:${txnFingerprintIdAttr}`}
+                    component={TransactionDetails}
+                  />
+                  <Redirect
+                    exact
+                    from={`/transaction/:${aggregatedTsAttr}/:${txnFingerprintIdAttr}`}
+                    to={`/transaction/:${txnFingerprintIdAttr}`}
+                  />
+                  {/* Insights */}
+                  <Route
+                    exact
+                    path="/insights"
+                    component={InsightsOverviewPage}
+                  />
 
-                {/* debug pages */}
-                <Route exact path="/debug" component={Debug} />
-                <Route exact path="/debug/tracez" component={Tracez} />
-                <Route exact path="/debug/redux" component={ReduxDebug} />
-                <Route exact path="/debug/chart" component={CustomChart} />
-                <Route
-                  exact
-                  path="/debug/enqueue_range"
-                  component={EnqueueRange}
-                />
-                <Route exact path="/debug/hotranges" component={HotRanges} />
-                <Route
-                  exact
-                  path="/debug/hotranges/:node_id"
-                  component={HotRanges}
-                />
+                  {/* debug pages */}
+                  <Route exact path="/debug" component={Debug} />
+                  <Route exact path="/debug/tracez" component={Tracez} />
+                  <Route exact path="/debug/redux" component={ReduxDebug} />
+                  <Route exact path="/debug/chart" component={CustomChart} />
+                  <Route
+                    exact
+                    path="/debug/enqueue_range"
+                    component={EnqueueRange}
+                  />
+                  <Route exact path="/debug/hotranges" component={HotRanges} />
+                  <Route
+                    exact
+                    path="/debug/hotranges/:node_id"
+                    component={HotRanges}
+                  />
 
-                <Route path="/raft">
-                  <Raft>
-                    <Switch>
-                      <Redirect exact from="/raft" to="/raft/ranges" />
-                      <Route exact path="/raft/ranges" component={RaftRanges} />
-                      <Route
-                        exact
-                        path="/raft/messages/all"
-                        component={RaftMessages}
-                      />
-                      <Route
-                        exact
-                        path={`/raft/messages/node/:${nodeIDAttr}`}
-                        component={RaftMessages}
-                      />
-                    </Switch>
-                  </Raft>
-                </Route>
+                  <Route path="/raft">
+                    <Raft>
+                      <Switch>
+                        <Redirect exact from="/raft" to="/raft/ranges" />
+                        <Route
+                          exact
+                          path="/raft/ranges"
+                          component={RaftRanges}
+                        />
+                        <Route
+                          exact
+                          path="/raft/messages/all"
+                          component={RaftMessages}
+                        />
+                        <Route
+                          exact
+                          path={`/raft/messages/node/:${nodeIDAttr}`}
+                          component={RaftMessages}
+                        />
+                      </Switch>
+                    </Raft>
+                  </Route>
 
-                <Route
-                  exact
-                  path="/reports/problemranges"
-                  component={ProblemRanges}
-                />
-                <Route
-                  exact
-                  path={`/reports/problemranges/:${nodeIDAttr}`}
-                  component={ProblemRanges}
-                />
-                <Route
-                  exact
-                  path="/reports/localities"
-                  component={Localities}
-                />
-                <Route
-                  exact
-                  path={`/reports/network/:${nodeIDAttr}`}
-                  component={Network}
-                />
-                <Route exact path="/reports/network" component={Network} />
-                <Route exact path="/reports/nodes" component={Nodes} />
-                <Route
-                  exact
-                  path="/reports/nodes/history"
-                  component={ConnectedDecommissionedNodeHistory}
-                />
-                <Route exact path="/reports/settings" component={Settings} />
-                <Route
-                  exact
-                  path={`/reports/certificates/:${nodeIDAttr}`}
-                  component={Certificates}
-                />
-                <Route
-                  exact
-                  path={`/reports/range/:${rangeIDAttr}`}
-                  component={Range}
-                />
-                <Route
-                  exact
-                  path={`/reports/stores/:${nodeIDAttr}`}
-                  component={Stores}
-                />
-                <Route
-                  exact
-                  path={`/reports/statements/diagnosticshistory`}
-                  component={StatementsDiagnosticsHistoryView}
-                />
-                {/* hot ranges */}
-                <Route exact path={`/hotranges`} component={HotRangesPage} />
-                {/* old route redirects */}
-                <Redirect
-                  exact
-                  from="/cluster"
-                  to="/metrics/overview/cluster"
-                />
-                <Redirect
-                  from={`/cluster/all/:${dashboardNameAttr}`}
-                  to={`/metrics/:${dashboardNameAttr}/cluster`}
-                />
-                <Redirect
-                  from={`/cluster/node/:${nodeIDAttr}/:${dashboardNameAttr}`}
-                  to={`/metrics/:${dashboardNameAttr}/node/:${nodeIDAttr}`}
-                />
-                <Redirect exact from="/cluster/nodes" to="/overview/list" />
-                <Redirect
-                  exact
-                  from={`/cluster/nodes/:${nodeIDAttr}`}
-                  to={`/node/:${nodeIDAttr}`}
-                />
-                <Redirect
-                  from={`/cluster/nodes/:${nodeIDAttr}/logs`}
-                  to={`/node/:${nodeIDAttr}/logs`}
-                />
-                <Redirect from="/cluster/events" to="/events" />
+                  <Route
+                    exact
+                    path="/reports/problemranges"
+                    component={ProblemRanges}
+                  />
+                  <Route
+                    exact
+                    path={`/reports/problemranges/:${nodeIDAttr}`}
+                    component={ProblemRanges}
+                  />
+                  <Route
+                    exact
+                    path="/reports/localities"
+                    component={Localities}
+                  />
+                  <Route
+                    exact
+                    path={`/reports/network/:${nodeIDAttr}`}
+                    component={Network}
+                  />
+                  <Route exact path="/reports/network" component={Network} />
+                  <Route exact path="/reports/nodes" component={Nodes} />
+                  <Route
+                    exact
+                    path="/reports/nodes/history"
+                    component={ConnectedDecommissionedNodeHistory}
+                  />
+                  <Route exact path="/reports/settings" component={Settings} />
+                  <Route
+                    exact
+                    path={`/reports/certificates/:${nodeIDAttr}`}
+                    component={Certificates}
+                  />
+                  <Route
+                    exact
+                    path={`/reports/range/:${rangeIDAttr}`}
+                    component={Range}
+                  />
+                  <Route
+                    exact
+                    path={`/reports/stores/:${nodeIDAttr}`}
+                    component={Stores}
+                  />
+                  <Route
+                    exact
+                    path={`/reports/statements/diagnosticshistory`}
+                    component={StatementsDiagnosticsHistoryView}
+                  />
+                  {/* hot ranges */}
+                  <Route exact path={`/hotranges`} component={HotRangesPage} />
+                  {/* old route redirects */}
+                  <Redirect
+                    exact
+                    from="/cluster"
+                    to="/metrics/overview/cluster"
+                  />
+                  <Redirect
+                    from={`/cluster/all/:${dashboardNameAttr}`}
+                    to={`/metrics/:${dashboardNameAttr}/cluster`}
+                  />
+                  <Redirect
+                    from={`/cluster/node/:${nodeIDAttr}/:${dashboardNameAttr}`}
+                    to={`/metrics/:${dashboardNameAttr}/node/:${nodeIDAttr}`}
+                  />
+                  <Redirect exact from="/cluster/nodes" to="/overview/list" />
+                  <Redirect
+                    exact
+                    from={`/cluster/nodes/:${nodeIDAttr}`}
+                    to={`/node/:${nodeIDAttr}`}
+                  />
+                  <Redirect
+                    from={`/cluster/nodes/:${nodeIDAttr}/logs`}
+                    to={`/node/:${nodeIDAttr}/logs`}
+                  />
+                  <Redirect from="/cluster/events" to="/events" />
 
-                <Redirect exact from="/nodes" to="/overview/list" />
+                  <Redirect exact from="/nodes" to="/overview/list" />
 
-                {/* 404 */}
-                <Route path="*" component={NotFound} />
-              </Switch>
-            </Layout>
-          </Route>
-        </Switch>
+                  {/* 404 */}
+                  <Route path="*" component={NotFound} />
+                </Switch>
+              </Layout>
+            </Route>
+          </Switch>
+        </CockroachCloudContext.Provider>
       </ConnectedRouter>
     </Provider>
   );