diff --git a/packages/grid/src/GridRange.ts b/packages/grid/src/GridRange.ts
index 8f30a5d1ac..48660123dc 100644
--- a/packages/grid/src/GridRange.ts
+++ b/packages/grid/src/GridRange.ts
@@ -1,16 +1,20 @@
 export type GridRangeIndex = number | null;
+export type RequiredGridRangeIndex = number;
 type LeftIndex = GridRangeIndex;
 type RightIndex = GridRangeIndex;
 type TopIndex = GridRangeIndex;
 type BottomIndex = GridRangeIndex;
 
-export type GridCell = { column: number; row: number };
+export type GridCell = {
+  column: RequiredGridRangeIndex;
+  row: RequiredGridRangeIndex;
+};
 
 export interface BoundedGridRange extends GridRange {
-  startColumn: number;
-  startRow: number;
-  endColumn: number;
-  endRow: number;
+  startColumn: RequiredGridRangeIndex;
+  startRow: RequiredGridRangeIndex;
+  endColumn: RequiredGridRangeIndex;
+  endRow: RequiredGridRangeIndex;
 }
 
 // Also exported via GridRange.SELECTION_DIRECTION
diff --git a/packages/iris-grid/src/ColumnStatistics.tsx b/packages/iris-grid/src/ColumnStatistics.tsx
index 3d6976703c..15c7219144 100644
--- a/packages/iris-grid/src/ColumnStatistics.tsx
+++ b/packages/iris-grid/src/ColumnStatistics.tsx
@@ -3,15 +3,12 @@ import classNames from 'classnames';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Button, CopyButton, LoadingSpinner } from '@deephaven/components';
 import { dhFreeze, dhRefresh, dhSortSlash, vsLock } from '@deephaven/icons';
-import type {
-  Column,
-  ColumnStatistics as APIColumnStatistics,
-} from '@deephaven/jsapi-types';
+import type { ColumnStatistics as APIColumnStatistics } from '@deephaven/jsapi-types';
 import Log from '@deephaven/log';
 import { CancelablePromise, PromiseUtils } from '@deephaven/utils';
 import { isExpandableGridModel } from '@deephaven/grid';
 import './ColumnStatistics.scss';
-import IrisGridModel from './IrisGridModel';
+import IrisGridModel, { DisplayColumn } from './IrisGridModel';
 
 const log = Log.module('ColumnStatistics');
 const STATS_LABEL_OVERRIDES: Record<string, string> = {
@@ -26,14 +23,14 @@ interface Statistic {
 }
 
 interface ColumnStatisticsProps {
-  column: Column;
+  column: DisplayColumn;
   model: IrisGridModel;
   onStatistics: () => void;
 }
 interface ColumnStatisticsState {
   error: unknown;
   loading: boolean;
-  statistics: Statistic[] | null;
+  statistics: readonly Statistic[] | null;
   numRows: number;
 }
 
@@ -84,7 +81,7 @@ class ColumnStatistics extends Component<
   cancelablePromise: CancelablePromise<APIColumnStatistics> | null;
 
   maybeGenerateStatistics(): void {
-    const { model } = this.props;
+    const { column, model } = this.props;
 
     const numRows =
       model.rowCount -
@@ -92,7 +89,7 @@ class ColumnStatistics extends Component<
       model.floatingBottomRowCount -
       model.floatingTopRowCount;
     this.setState({ numRows });
-    if (!model.isColumnStatisticsAvailable) {
+    if (!model.isColumnStatisticsAvailable || column.isProxy === true) {
       this.setState({ loading: false });
     } else if (numRows < ColumnStatistics.AUTO_GENERATE_LIMIT) {
       this.handleGenerateStatistics();
@@ -200,7 +197,7 @@ class ColumnStatistics extends Component<
     return (
       <div className="column-statistics">
         <div className="column-statistics-title">
-          {column.name}
+          {column.displayName ?? column.name}
           <span className="column-statistics-type">&nbsp;({columnType})</span>
           <CopyButton
             className="column-statistics-copy"
diff --git a/packages/iris-grid/src/CrossColumnSearch.tsx b/packages/iris-grid/src/CrossColumnSearch.tsx
index 0243562b60..0d446f3182 100644
--- a/packages/iris-grid/src/CrossColumnSearch.tsx
+++ b/packages/iris-grid/src/CrossColumnSearch.tsx
@@ -17,6 +17,7 @@ import type {
 import { TableUtils } from '@deephaven/jsapi-utils';
 import './CrossColumnSearch.scss';
 import { ColumnName } from './CommonTypes';
+import { DisplayColumn } from './IrisGridModel';
 
 interface CrossColumnSearchProps {
   value: string;
@@ -27,7 +28,7 @@ interface CrossColumnSearchProps {
     selectedColumns: readonly ColumnName[],
     invertSelection: boolean
   ) => void;
-  columns: readonly Column[];
+  columns: readonly DisplayColumn[];
 }
 
 interface CrossColumnSearchState {
@@ -233,23 +234,27 @@ class CrossColumnSearch extends PureComponent<
             <div className="cross-column-popup">
               Searched Columns
               <div className="cross-column-scroll">
-                {columns.map(column => (
-                  <React.Fragment key={column.name}>
-                    <Checkbox
-                      className="cross-column-checkbox"
-                      checked={
-                        invertSelection
-                          ? !selectedColumns.includes(column.name)
-                          : selectedColumns.includes(column.name)
-                      }
-                      onChange={() => this.toggleColumn(column.name)}
-                    >
-                      {column.name}
-                    </Checkbox>
+                {columns.map(column => {
+                  if (column.isProxy === true) return null;
 
-                    {column.type.substring(column.type.lastIndexOf('.') + 1)}
-                  </React.Fragment>
-                ))}
+                  return (
+                    <React.Fragment key={column.name}>
+                      <Checkbox
+                        className="cross-column-checkbox"
+                        checked={
+                          invertSelection
+                            ? !selectedColumns.includes(column.name)
+                            : selectedColumns.includes(column.name)
+                        }
+                        onChange={() => this.toggleColumn(column.name)}
+                      >
+                        {column.name}
+                      </Checkbox>
+
+                      {column.type.substring(column.type.lastIndexOf('.') + 1)}
+                    </React.Fragment>
+                  );
+                })}
               </div>
               <div className="cross-column-button-bar">
                 <button
diff --git a/packages/iris-grid/src/IrisGrid.tsx b/packages/iris-grid/src/IrisGrid.tsx
index 7f7605097c..4dc456270b 100644
--- a/packages/iris-grid/src/IrisGrid.tsx
+++ b/packages/iris-grid/src/IrisGrid.tsx
@@ -171,20 +171,21 @@ import { ChartBuilderSettings } from './sidebar/ChartBuilder';
 import AggregationOperation from './sidebar/aggregations/AggregationOperation';
 import { UIRollupConfig } from './sidebar/RollupRows';
 import {
-  ReadonlyAdvancedFilterMap,
-  ColumnName,
-  ReadonlyQuickFilterMap,
-  ReadonlyAggregationMap,
-  ReadonlyOperationMap,
   Action,
-  OptionItem,
-  UITotalsTableConfig,
-  InputFilter,
-  PendingDataMap,
+  AdvancedFilterMap,
   AdvancedFilterOptions,
+  ColumnName,
+  InputFilter,
+  OperationMap,
+  OptionItem,
   PendingDataErrorMap,
+  PendingDataMap,
   QuickFilterMap,
-  OperationMap,
+  ReadonlyAdvancedFilterMap,
+  ReadonlyAggregationMap,
+  ReadonlyOperationMap,
+  ReadonlyQuickFilterMap,
+  UITotalsTableConfig,
 } from './CommonTypes';
 import ColumnHeaderGroup from './ColumnHeaderGroup';
 import { IrisGridThemeContext } from './IrisGridThemeProvider';
@@ -1636,19 +1637,31 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     });
   }
 
-  removeColumnFilter(modelColumn: ModelIndex): void {
+  removeColumnFilter(modelRange: ModelIndex | BoundedAxisRange): void {
     this.startLoading('Filtering...', true);
 
+    const clearRange: BoundedAxisRange = Array.isArray(modelRange)
+      ? modelRange
+      : [modelRange, modelRange];
+
     this.setState(
       ({ advancedFilters, quickFilters }: Partial<IrisGridState>) => {
-        const newAdvancedFilters = advancedFilters
+        const newAdvancedFilters: AdvancedFilterMap = advancedFilters
           ? new Map(advancedFilters)
           : new Map();
-        const newQuickFilters = quickFilters
+        const newQuickFilters: QuickFilterMap = quickFilters
           ? new Map(quickFilters)
           : new Map();
-        newQuickFilters.delete(modelColumn);
-        newAdvancedFilters.delete(modelColumn);
+        newAdvancedFilters.forEach((_, column) => {
+          if (column >= clearRange[0] && column <= clearRange[1]) {
+            newAdvancedFilters.delete(column);
+          }
+        });
+        newQuickFilters.forEach((_, column) => {
+          if (column >= clearRange[0] && column <= clearRange[1]) {
+            newQuickFilters.delete(column);
+          }
+        });
 
         return {
           quickFilters: newQuickFilters,
diff --git a/packages/iris-grid/src/IrisGridModel.ts b/packages/iris-grid/src/IrisGridModel.ts
index 025dea6eba..ef47b703bd 100644
--- a/packages/iris-grid/src/IrisGridModel.ts
+++ b/packages/iris-grid/src/IrisGridModel.ts
@@ -1,8 +1,10 @@
 /* eslint-disable class-methods-use-this */
 import type { Event, EventTarget } from 'event-target-shim';
 import {
+  BoundedAxisRange,
   DataBarGridModel,
   DataBarOptions,
+  GridCell,
   GridModel,
   GridRange,
   GridThemeType,
@@ -33,6 +35,21 @@ import {
 } from './CommonTypes';
 import ColumnHeaderGroup from './ColumnHeaderGroup';
 
+export type DisplayColumn = Column & {
+  /**
+   * Name to display with the column.
+   * The `name` property on `Column` is a unique identifier and must be a valid Java identifier,
+   * whereas `displayName` can be any string and does not need to be unique.
+   */
+  displayName?: string;
+
+  /**
+   * Whether this column is a proxy column for other columns or not.
+   * If it's a proxy column, it may not appear in some lists.
+   */
+  isProxy?: boolean;
+};
+
 type IrisGridModelEventNames =
   (typeof IrisGridModel.EVENT)[keyof typeof IrisGridModel.EVENT];
 
@@ -133,7 +150,23 @@ abstract class IrisGridModel<
    * Gets the columns for this model
    * @returns All columns in the model
    */
-  abstract get columns(): readonly Column[];
+  abstract get columns(): readonly DisplayColumn[];
+
+  /**
+   * Retrieve the grouped columns for this model
+   * @returns The columns that are grouped
+   */
+  get groupedColumns(): readonly DisplayColumn[] {
+    return EMPTY_ARRAY;
+  }
+
+  /**
+   * Gets the columns for the model before any transformations (such as rollups) are applied.
+   * @returns All original columns in the model.
+   */
+  get originalColumns(): readonly DisplayColumn[] {
+    return this.columns;
+  }
 
   /**
    * Gets the column index for this model
@@ -143,26 +176,42 @@ abstract class IrisGridModel<
   abstract getColumnIndexByName(name: string): ModelIndex | undefined;
 
   /**
-   * Gets the columns for the model before any transformations (such as rollups) are applied.
-   * @returns All original columns in the model.
+   * Retrieve the source cell for a given cell. Returns something different if the cell is a proxied cell
+   * that retrieves data from another cell.
+   * @param column Column to get the source for
+   * @param row Row to get the source for
+   * @returns Source cell where the data is coming from
    */
-  get originalColumns(): readonly Column[] {
-    return this.columns;
+  sourceForCell(column: ModelIndex, row: ModelIndex): GridCell {
+    return { column, row };
   }
 
-  abstract get initialMovedColumns(): readonly MoveOperation[];
+  /**
+   * Retrieve the range of columns to clear filters on for a given column.
+   * @param column Column to get the range of filters to clear.
+   * @returns Axis range of the column filters to clear, or `null` if this should not have a clear filter option.
+   */
+  getClearFilterRange(column: ModelIndex): BoundedAxisRange | null {
+    if (this.isFilterable(column)) {
+      return [column, column];
+    }
+    return null;
+  }
+
+  /** List of column movements defined by the model. Used as initial movements for IrisGrid */
+  get initialMovedColumns(): readonly MoveOperation[] {
+    return EMPTY_ARRAY;
+  }
 
   /** List of row movements defined by the model. Used as initial movements for IrisGrid */
-  abstract get initialMovedRows(): readonly MoveOperation[];
+  get initialMovedRows(): readonly MoveOperation[] {
+    return EMPTY_ARRAY;
+  }
 
   /** List of column header groups defined by the model */
-  abstract get initialColumnHeaderGroups(): readonly ColumnHeaderGroup[];
-
-  /**
-   * Retrieve the grouped columns for this model
-   * @returns The columns that are groupe
-   */
-  abstract get groupedColumns(): readonly Column[];
+  get initialColumnHeaderGroups(): readonly ColumnHeaderGroup[] {
+    return EMPTY_ARRAY;
+  }
 
   /**
    * @param column The model column index
diff --git a/packages/iris-grid/src/IrisGridProxyModel.ts b/packages/iris-grid/src/IrisGridProxyModel.ts
index e5142502f2..49b6ff8405 100644
--- a/packages/iris-grid/src/IrisGridProxyModel.ts
+++ b/packages/iris-grid/src/IrisGridProxyModel.ts
@@ -452,6 +452,12 @@ class IrisGridProxyModel extends IrisGridModel {
     return this.model.groupedColumns;
   }
 
+  sourceForCell: IrisGridModel['sourceForCell'] = (...args) =>
+    this.model.sourceForCell(...args);
+
+  getClearFilterRange: IrisGridModel['getClearFilterRange'] = (...args) =>
+    this.model.getClearFilterRange(...args);
+
   get description(): string {
     return this.model.description;
   }
diff --git a/packages/iris-grid/src/IrisGridTableModelTemplate.ts b/packages/iris-grid/src/IrisGridTableModelTemplate.ts
index ca1ed9a01c..74e8a7b5a2 100644
--- a/packages/iris-grid/src/IrisGridTableModelTemplate.ts
+++ b/packages/iris-grid/src/IrisGridTableModelTemplate.ts
@@ -45,8 +45,8 @@ import type {
   DirectionOption,
   Marker,
   ValuePlacementOption,
-} from '@deephaven/grid';
-import IrisGridModel from './IrisGridModel';
+} from 'packages/grid/src/DataBarGridModel';
+import IrisGridModel, { DisplayColumn } from './IrisGridModel';
 import AggregationOperation from './sidebar/aggregations/AggregationOperation';
 import IrisGridUtils from './IrisGridUtils';
 import MissingKeyError from './MissingKeyError';
@@ -67,8 +67,6 @@ const log = Log.module('IrisGridTableModel');
 const SET_VIEWPORT_THROTTLE = 150;
 const APPLY_VIEWPORT_THROTTLE = 0;
 
-const EMPTY_ARRAY: unknown[] = [];
-
 export function isIrisGridTableModelTemplate(
   model: IrisGridModel
 ): model is IrisGridTableModelTemplate {
@@ -384,7 +382,8 @@ class IrisGridTableModelTemplate<
 
   get rowCount(): number {
     return (
-      this.table.size +
+      // Table size can be negative if the table isn't ready yet
+      Math.max(this.table.size, 0) +
       this.pendingNewRowCount +
       (this.totals?.operationOrder?.length ?? 0)
     );
@@ -519,7 +518,7 @@ class IrisGridTableModelTemplate<
         return undefined;
       }
 
-      const column = this.totalsColumn(x, y) ?? this.columns[x];
+      const column = this.sourceColumn(x, y);
       const hasCustomColumnFormat = this.getCachedCustomColumnFormatFlag(
         this.formatter,
         column.name,
@@ -600,7 +599,7 @@ class IrisGridTableModelTemplate<
 
       // Fallback to formatting based on the value/type of the cell
       if (value != null) {
-        const column = this.totalsColumn(x, y) ?? this.columns[x];
+        const column = this.sourceColumn(x, y);
         if (TableUtils.isDateType(column.type) || column.name === 'Date') {
           assertNotNull(theme.dateColor);
           return theme.dateColor;
@@ -696,7 +695,7 @@ class IrisGridTableModelTemplate<
     if (isColumnHeaderGroup(header)) {
       return header.isNew ? '' : header.name;
     }
-    return header?.name;
+    return header?.displayName ?? header?.name;
   }
 
   colorForColumnHeader(x: ModelIndex, depth = 0): string | null {
@@ -730,7 +729,7 @@ class IrisGridTableModelTemplate<
   columnAtDepth(
     x: ModelIndex,
     depth = 0
-  ): ColumnHeaderGroup | Column | undefined {
+  ): ColumnHeaderGroup | DisplayColumn | undefined {
     if (depth === 0) {
       return this.columns[x];
     }
@@ -913,13 +912,6 @@ class IrisGridTableModelTemplate<
     return this.getMemoizedInitialMovedColumns(this.layoutHints ?? undefined);
   }
 
-  /**
-   * Not currently used by anything.
-   */
-  get initialMovedRows(): MoveOperation[] {
-    return EMPTY_ARRAY as MoveOperation[];
-  }
-
   getMemoizedInitialColumnHeaderGroups = memoize(
     (layoutHints?: LayoutHints) =>
       IrisGridUtils.parseColumnHeaderGroups(
@@ -983,10 +975,6 @@ class IrisGridTableModelTemplate<
     this._columnHeaderGroupMap = groupMap;
   }
 
-  get groupedColumns(): Column[] {
-    return [];
-  }
-
   row(y: ModelIndex): R | null {
     const totalsRowCount = this.totals?.operationOrder?.length ?? 0;
     const showOnTop = this.totals?.showOnTop ?? false;
@@ -1006,29 +994,37 @@ class IrisGridTableModelTemplate<
   }
 
   /**
-   * Retrieve the totals column if this is a totals row, or null otherwise
-   * @param x Column index to get the totals column from
-   * @param y Row index to get the totals column from
+   * Retrieve the source column for given coordinates.
+   * - Retrieve the totals column if this is a totals row
+   * - Retrieve the source column if it's a proxied column
+   * - Otherwise return the column at the given index
+   * @param column Column index to get the source column from
+   * @param row Row index to get the source column from
    */
-  totalsColumn(x: ModelIndex, y: ModelIndex): Column | undefined | null {
-    const totalsRow = this.totalsRow(y);
-    if (totalsRow == null) return null;
-
-    const operation = this.totals?.operationOrder[totalsRow];
-    const defaultOperation =
-      this.totals?.defaultOperation ?? AggregationOperation.SUM;
-    const tableColumn = this.columns[x];
-
-    // Find the matching totals table column for the operation
-    // When there are multiple aggregations, the column name will be the original name of the column with the operation appended afterward
-    // When the the operation is the default operation OR there is only one operation, then the totals column name is just the original column name
-    return this.totalsTable?.columns.find(
-      column =>
-        column.name === `${tableColumn.name}__${operation}` ||
-        ((operation === defaultOperation ||
-          this.totals?.operationOrder.length === 1) &&
-          column.name === tableColumn.name)
-    );
+  sourceColumn(column: ModelIndex, row: ModelIndex): Column {
+    const totalsRow = this.totalsRow(row);
+    if (totalsRow != null) {
+      const operation = this.totals?.operationOrder[totalsRow];
+      const defaultOperation =
+        this.totals?.defaultOperation ?? AggregationOperation.SUM;
+      const tableColumn = this.columns[column];
+
+      // Find the matching totals table column for the operation
+      // When there are multiple aggregations, the column name will be the original name of the column with the operation appended afterward
+      // When the the operation is the default operation OR there is only one operation, then the totals column name is just the original column name
+      const totalsColumn = this.totalsTable?.columns.find(
+        col =>
+          col.name === `${tableColumn.name}__${operation}` ||
+          ((operation === defaultOperation ||
+            this.totals?.operationOrder.length === 1) &&
+            col.name === tableColumn.name)
+      );
+      if (totalsColumn != null) {
+        return totalsColumn;
+      }
+      // There may be cases were the totals table doesn't have a column, such as when there's a virtual column
+    }
+    return this.columns[column];
   }
 
   /**
diff --git a/packages/iris-grid/src/IrisGridTreeTableModel.ts b/packages/iris-grid/src/IrisGridTreeTableModel.ts
index 003d58177c..f26218c4dc 100644
--- a/packages/iris-grid/src/IrisGridTreeTableModel.ts
+++ b/packages/iris-grid/src/IrisGridTreeTableModel.ts
@@ -1,10 +1,26 @@
 /* eslint class-methods-use-this: "off" */
 import memoize from 'memoize-one';
-import { GridRange, ModelIndex } from '@deephaven/grid';
-import type { Column, TreeRow, TreeTable } from '@deephaven/jsapi-types';
+import {
+  BoundedAxisRange,
+  GridCell,
+  GridRange,
+  ModelIndex,
+} from '@deephaven/grid';
+import type {
+  dh as DhType,
+  Column,
+  InputTable,
+  TreeRow,
+  TreeTable,
+} from '@deephaven/jsapi-types';
+import Log from '@deephaven/log';
+import { Formatter, TableUtils } from '@deephaven/jsapi-utils';
 import { assertNotNull } from '@deephaven/utils';
-import { UIRow, ColumnName } from './CommonTypes';
+import { UIRow, ColumnName, CellData } from './CommonTypes';
 import IrisGridTableModelTemplate from './IrisGridTableModelTemplate';
+import { DisplayColumn } from './IrisGridModel';
+
+const log = Log.module('IrisGridTreeTableModel');
 
 export interface UITreeRow extends UIRow {
   isExpanded: boolean;
@@ -15,18 +31,61 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
   TreeTable,
   UITreeRow
 > {
-  // table: TreeTable
+  /** We keep a virtual column at the front that tracks the "group" that is expanded */
+  private virtualColumns: DisplayColumn[];
+
+  constructor(
+    dh: DhType,
+    table: TreeTable,
+    formatter = new Formatter(dh),
+    inputTable: InputTable | null = null
+  ) {
+    super(dh, table, formatter, inputTable);
+    this.virtualColumns = [
+      {
+        name: '__DH_UI_GROUP__',
+        displayName: 'Group',
+        type: TableUtils.dataType.STRING,
+        constituentType: TableUtils.dataType.STRING,
+        isPartitionColumn: false,
+        isSortable: false,
+        isProxy: true,
+        description: 'Key column',
+        filter: () => {
+          throw new Error('Filter not implemented for virtual column');
+        },
+        sort: () => {
+          throw new Error('Sort not implemented virtual column');
+        },
+        formatColor: () => {
+          throw new Error('Color not implemented for virtual column');
+        },
+        formatRowColor: () => {
+          throw new Error('Color not implemented for virtual column');
+        },
+      },
+    ];
+  }
 
   applyBufferedViewport(
     viewportTop: number,
     viewportBottom: number,
     columns: Column[]
   ): void {
-    this.table.setViewport(viewportTop, viewportBottom, columns);
+    const viewportColumns = [
+      // Need to always fetch the grouped columns so we always have key data for the rows
+      // Used to display our virtual key column
+      ...this.table.groupedColumns,
+      ...columns.filter(
+        c =>
+          !this.virtualColumns.includes(c) && !this.groupedColumns.includes(c)
+      ),
+    ];
+    this.table.setViewport(viewportTop, viewportBottom, viewportColumns);
   }
 
   textForCell(x: ModelIndex, y: ModelIndex): string {
-    const column = this.columns[x];
+    const column = this.sourceColumn(x, y);
     const row = this.row(y);
     if (row != null && column != null) {
       if (!row.hasChildren && column.constituentType != null) {
@@ -49,8 +108,23 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
 
   extractViewportRow(row: TreeRow, columns: Column[]): UITreeRow {
     const { isExpanded, hasChildren, depth } = row;
+    const extractedRow = super.extractViewportRow(row, columns);
+    const modifiedData = new Map<ModelIndex, CellData>(extractedRow.data);
+    if (hasChildren) {
+      for (let i = 0; i < this.virtualColumns.length; i += 1) {
+        const key = i + (depth - 1) + (this.virtualColumns.length - 1);
+        const cellData = modifiedData.get(key);
+        if (cellData == null) {
+          log.warn('Missing key data for virtual column', i, depth, key, row);
+        } else {
+          modifiedData.set(i, cellData);
+        }
+      }
+    }
+
     return {
-      ...super.extractViewportRow(row, columns),
+      ...extractedRow,
+      data: modifiedData,
       isExpanded,
       hasChildren,
       depth,
@@ -108,8 +182,41 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
     return result;
   }
 
-  get groupedColumns(): Column[] {
-    return this.table.groupedColumns;
+  get columns(): Column[] {
+    return this.getCachedColumns(this.virtualColumns, super.columns);
+  }
+
+  get groupedColumns(): readonly Column[] {
+    return this.getCachedGroupColumns(
+      this.virtualColumns,
+      this.table.groupedColumns
+    );
+  }
+
+  sourceForCell(column: ModelIndex, row: ModelIndex): GridCell {
+    if (column >= this.virtualColumns.length) {
+      return { column, row };
+    }
+    const depth = this.depthForRow(row);
+    return { column: column + depth, row };
+  }
+
+  sourceColumn(column: ModelIndex, row: ModelIndex): Column {
+    if (column >= this.virtualColumns.length) {
+      return super.sourceColumn(column, row);
+    }
+
+    const depth = this.depthForRow(row);
+    return this.columns[column + depth];
+  }
+
+  getClearFilterRange(column: ModelIndex): BoundedAxisRange | null {
+    if (column >= this.virtualColumns.length) {
+      return super.getClearFilterRange(column);
+    }
+    // Source for the proxied column could be any of the grouped columns.
+    // Return the range of columns matching the grouped columns.
+    return [this.virtualColumns.length, this.groupedColumns.length];
   }
 
   get hasExpandableRows(): boolean {
@@ -135,7 +242,8 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
   isFilterable(columnIndex: ModelIndex): boolean {
     return this.getCachedFilterableColumnSet(
       this.columns,
-      this.groupedColumns
+      this.groupedColumns,
+      this.virtualColumns
     ).has(columnIndex);
   }
 
@@ -182,12 +290,30 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate<
     return (row?.depth ?? 1) - 1;
   }
 
+  getCachedColumns = memoize(
+    (virtualColumns: readonly Column[], tableColumns: readonly Column[]) => [
+      ...virtualColumns,
+      ...tableColumns,
+    ]
+  );
+
+  getCachedGroupColumns = memoize(
+    (
+      virtualColumns: readonly Column[],
+      tableGroupedColumns: readonly Column[]
+    ) => [...virtualColumns, ...tableGroupedColumns]
+  );
+
   getCachedFilterableColumnSet = memoize(
-    (columns: Column[], groupedColumns: Column[]) =>
+    (
+      columns: readonly Column[],
+      groupedColumns: readonly Column[],
+      virtualColumns: readonly Column[]
+    ) =>
       new Set(
-        (groupedColumns?.length > 0 ? groupedColumns : columns).map(c1 =>
-          columns.findIndex(c2 => c1.name === c2.name)
-        )
+        (groupedColumns?.length > 0 ? groupedColumns : columns)
+          .filter(c => !virtualColumns.includes(c))
+          .map(c1 => columns.findIndex(c2 => c1.name === c2.name))
       )
   );
 
diff --git a/packages/iris-grid/src/mousehandlers/IrisGridColumnSelectMouseHandler.ts b/packages/iris-grid/src/mousehandlers/IrisGridColumnSelectMouseHandler.ts
index 44db274e02..fcb5813fbe 100644
--- a/packages/iris-grid/src/mousehandlers/IrisGridColumnSelectMouseHandler.ts
+++ b/packages/iris-grid/src/mousehandlers/IrisGridColumnSelectMouseHandler.ts
@@ -6,6 +6,7 @@ import {
 } from '@deephaven/grid';
 import type { Column } from '@deephaven/jsapi-types';
 import { IrisGrid } from '../IrisGrid';
+import { DisplayColumn } from '../IrisGridModel';
 
 /**
  * Handles interaction with tables when the Linker tool is active
@@ -25,8 +26,8 @@ class IrisGridColumnSelectMouseHandler extends GridMouseHandler {
     return isSelectingColumn;
   }
 
-  private isValidColumn(tableColumn: Column | null): boolean {
-    if (tableColumn == null) {
+  private isValidColumn(tableColumn: DisplayColumn | null): boolean {
+    if (tableColumn == null || tableColumn.isProxy === true) {
       return false;
     }
 
diff --git a/packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx b/packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx
index 5833f4096b..03e5a03e62 100644
--- a/packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx
+++ b/packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx
@@ -361,21 +361,22 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
   }
 
   getCellActions(
-    modelColumn: number | undefined | null,
+    modelColumn: ModelIndex,
     grid: Grid,
     gridPoint: GridPoint
   ): ContextAction[] {
-    assertNotNull(modelColumn);
     const { dh, irisGrid } = this;
     const { column: columnIndex, row: rowIndex } = gridPoint;
     const { model, canCopy } = irisGrid.props;
     const { columns } = model;
     const modelRow = irisGrid.getModelRow(rowIndex);
     assertNotNull(modelRow);
-    const value = model.valueForCell(modelColumn, modelRow);
+    const sourceCell = model.sourceForCell(modelColumn, modelRow);
+    const { column: sourceColumn, row: sourceRow } = sourceCell;
+    const value = model.valueForCell(sourceColumn, sourceRow);
 
-    const valueText = model.textForCell(modelColumn, modelRow);
-    const column = columns[modelColumn];
+    const valueText = model.textForCell(sourceColumn, sourceRow);
+    const column = columns[sourceColumn];
 
     const actions = [] as ContextAction[];
 
@@ -400,7 +401,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
     if (column == null || rowIndex == null) return actions;
 
     // grid data area context menu options
-    if (model.isFilterable(modelColumn)) {
+    if (model.isFilterable(sourceColumn)) {
       // cell data area contextmenu options
       const filterMenu = {
         title: 'Filter by Value',
@@ -420,12 +421,12 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
 
       if (value == null) {
         // null gets a special menu
-        if (quickFilters.get(modelColumn)) {
+        if (quickFilters.get(sourceColumn)) {
           filterMenu.actions.push({
             title: 'And',
             actions: this.nullFilterActions(
               column,
-              quickFilters.get(modelColumn),
+              quickFilters.get(sourceColumn),
               '&&'
             ),
             order: 2,
@@ -435,13 +436,13 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
         filterMenu.actions.push(...this.nullFilterActions(column));
       } else if (value === '') {
         // empty string gets a special menu
-        if (quickFilters.get(modelColumn)) {
+        if (quickFilters.get(sourceColumn)) {
           filterMenu.actions.push({
             title: 'And',
 
             actions: this.emptyStringFilterActions(
               column,
-              quickFilters.get(modelColumn),
+              quickFilters.get(sourceColumn),
               '&&'
             ),
             order: 2,
@@ -451,13 +452,13 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
         filterMenu.actions.push(...this.emptyStringFilterActions(column));
       } else if (TableUtils.isBooleanType(column.type)) {
         // boolean should have OR condition, and handles it's own null menu options
-        if (quickFilters.get(modelColumn)) {
+        if (quickFilters.get(sourceColumn)) {
           filterMenu.actions.push({
             title: 'Or',
             actions: this.booleanFilterActions(
               column,
               valueText,
-              quickFilters.get(modelColumn),
+              quickFilters.get(sourceColumn),
               '||'
             ),
             order: 2,
@@ -472,21 +473,21 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
         TableUtils.isCharType(column.type)
       ) {
         // Chars get treated like numbers in terms of which filters are available
-        assertNotNull(modelColumn);
+        assertNotNull(sourceColumn);
         // We want to show the full unformatted value if it's a number, so user knows which value they are matching
         // If it's a Char we just show the char
         const numberValueText = TableUtils.isCharType(column.type)
           ? String.fromCharCode(value as number)
           : `${value}`;
 
-        if (quickFilters.get(modelColumn)) {
+        if (quickFilters.get(sourceColumn)) {
           filterMenu.actions.push({
             title: 'And',
             actions: this.numberFilterActions(
               column,
               numberValueText,
               value,
-              quickFilters.get(modelColumn),
+              quickFilters.get(sourceColumn),
               '&&'
             ),
             order: 2,
@@ -498,13 +499,13 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
             column,
             numberValueText,
             value,
-            quickFilters.get(modelColumn)
+            quickFilters.get(sourceColumn)
           )
         );
       } else if (TableUtils.isDateType(column.type)) {
         const dateValueText = dateFilterFormatter.format(value as Date);
         const previewValue = previewFilterFormatter.format(value as Date);
-        if (quickFilters.get(modelColumn)) {
+        if (quickFilters.get(sourceColumn)) {
           filterMenu.actions.push({
             title: 'And',
             actions: this.dateFilterActions(
@@ -512,7 +513,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
               dateValueText,
               previewValue,
               value,
-              quickFilters.get(modelColumn),
+              quickFilters.get(sourceColumn),
               '&&'
             ),
             order: 2,
@@ -525,11 +526,11 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
             dateValueText,
             previewValue,
             value,
-            quickFilters.get(modelColumn)
+            quickFilters.get(sourceColumn)
           )
         );
       } else {
-        if (quickFilters.get(modelColumn)) {
+        if (quickFilters.get(sourceColumn)) {
           filterMenu.actions.push({
             title: 'And',
 
@@ -537,7 +538,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
               column,
               valueText,
               value,
-              quickFilters.get(modelColumn),
+              quickFilters.get(sourceColumn),
               '&&'
             ),
             order: 2,
@@ -555,26 +556,25 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
     }
 
     // Expand/Collapse options
-    if (isExpandableGridModel(model) && model.isRowExpandable(modelRow)) {
+    if (isExpandableGridModel(model) && model.isRowExpandable(sourceRow)) {
       // If there are grouped columns, then it is a rollup
-      // For rollups, the column number will be the depth minus one
-      const expandingColumn =
-        model.groupedColumns.length > 0 ? model.depthForRow(modelRow) - 1 : 0;
-      const cellValue = model.valueForCell(expandingColumn, modelRow);
+      // The first column will be the "group" column with the value that should be expanded
+      const expandingColumn = 0;
+      const cellValue = model.valueForCell(expandingColumn, sourceRow);
       const cellText =
         cellValue == null
           ? 'null'
-          : model.textForCell(expandingColumn, modelRow);
+          : model.textForCell(expandingColumn, sourceRow);
 
       actions.push({
         title: IrisGridContextMenuHandler.getRowOptionFormatted(
-          model.isRowExpanded(modelRow) ? 'Collapse' : 'Expand',
+          model.isRowExpanded(sourceRow) ? 'Collapse' : 'Expand',
           cellText
         ),
         group: IrisGridContextMenuHandler.GROUP_EXPAND_COLLAPSE,
         order: 10,
         action: () => {
-          model.setRowExpanded(modelRow, !model.isRowExpanded(modelRow));
+          model.setRowExpanded(sourceRow, !model.isRowExpanded(sourceRow));
         },
       });
 
@@ -587,7 +587,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
           group: IrisGridContextMenuHandler.GROUP_EXPAND_COLLAPSE,
           order: 20,
           action: () => {
-            model.setRowExpanded(modelRow, true, true);
+            model.setRowExpanded(sourceRow, true, true);
           },
         });
       }
@@ -735,10 +735,11 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
     const actions: ResolvableContextAction[] = [];
 
     if (modelColumn != null && modelRow != null) {
-      const value = model.valueForCell(modelColumn, modelRow);
-
-      const valueText = model.textForCell(modelColumn, modelRow);
-      const column = columns[modelColumn];
+      const sourceCell = model.sourceForCell(modelColumn, modelRow ?? 0);
+      const { column: sourceColumn, row: sourceRow } = sourceCell;
+      const value = model.valueForCell(sourceColumn, sourceRow);
+      const valueText = model.textForCell(sourceColumn, sourceRow);
+      const column = columns[sourceColumn];
 
       const { onContextMenu } = irisGrid.props;
 
@@ -758,20 +759,30 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
       }
     }
 
-    if (modelColumn != null && model.isFilterable(modelColumn)) {
-      // Clear column filter should still be available after last row
-      // And should be available in both header and body context menus
-      actions.push({
-        title: 'Clear Column Filter',
-        group: IrisGridContextMenuHandler.GROUP_FILTER,
-        order: 30,
-        action: () => {
-          this.irisGrid.removeColumnFilter(modelColumn);
-        },
-        disabled: !(
-          quickFilters.has(modelColumn) || advancedFilters.has(modelColumn)
-        ),
-      });
+    if (modelColumn != null) {
+      const clearFilterRange = model.getClearFilterRange(modelColumn);
+      if (clearFilterRange != null && clearFilterRange.length > 0) {
+        // Clear column filter should still be available after last row
+        // And should be available in both header and body context menus
+        actions.push({
+          title:
+            clearFilterRange[1] - clearFilterRange[0] > 0
+              ? 'Clear Group Filter'
+              : 'Clear Column Filter',
+          group: IrisGridContextMenuHandler.GROUP_FILTER,
+          order: 30,
+          action: () => {
+            this.irisGrid.removeColumnFilter(clearFilterRange);
+          },
+          disabled:
+            !Array.from(quickFilters.keys()).some(
+              col => col >= clearFilterRange[0] && col <= clearFilterRange[1]
+            ) &&
+            !Array.from(advancedFilters.keys()).some(
+              col => col >= clearFilterRange[0] && col <= clearFilterRange[1]
+            ),
+        });
+      }
     }
 
     if (
diff --git a/packages/iris-grid/src/sidebar/aggregations/AggregationEdit.tsx b/packages/iris-grid/src/sidebar/aggregations/AggregationEdit.tsx
index 4e7e33ab47..4ff780149b 100644
--- a/packages/iris-grid/src/sidebar/aggregations/AggregationEdit.tsx
+++ b/packages/iris-grid/src/sidebar/aggregations/AggregationEdit.tsx
@@ -3,11 +3,11 @@ import classNames from 'classnames';
 import { CSSTransition } from 'react-transition-group';
 import { Button, Checkbox, ItemList, ThemeExport } from '@deephaven/components';
 import { dhSortAlphaDown, dhSortAlphaUp } from '@deephaven/icons';
-import type { Column } from '@deephaven/jsapi-types';
 import { TableUtils } from '@deephaven/jsapi-utils';
 import { Aggregation } from './Aggregations';
 import { filterValidColumns } from './AggregationUtils';
 import './AggregationEdit.scss';
+import { DisplayColumn } from '../../IrisGridModel';
 
 interface AggregationEditItem {
   value: string;
@@ -16,7 +16,7 @@ interface AggregationEditItem {
 
 export type AggregationEditProps = {
   aggregation: Aggregation;
-  columns: readonly Column[];
+  columns: readonly DisplayColumn[];
   onChange: (aggregation: Aggregation) => void;
 };
 
diff --git a/packages/iris-grid/src/sidebar/aggregations/AggregationUtils.ts b/packages/iris-grid/src/sidebar/aggregations/AggregationUtils.ts
index db03167e9e..9233ab906b 100644
--- a/packages/iris-grid/src/sidebar/aggregations/AggregationUtils.ts
+++ b/packages/iris-grid/src/sidebar/aggregations/AggregationUtils.ts
@@ -1,5 +1,5 @@
-import type { Column } from '@deephaven/jsapi-types';
 import { TableUtils } from '@deephaven/jsapi-utils';
+import { DisplayColumn } from '../../IrisGridModel';
 import AggregationOperation from './AggregationOperation';
 
 export const SELECTABLE_OPTIONS = [
@@ -68,12 +68,15 @@ export const isValidOperation = (
 };
 
 export const filterValidColumns = (
-  columns: readonly Column[],
+  columns: readonly DisplayColumn[],
   operationType: AggregationOperation
-): Column[] => columns.filter(c => isValidOperation(operationType, c.type));
+): DisplayColumn[] =>
+  columns.filter(
+    c => c.isProxy !== true && isValidOperation(operationType, c.type)
+  );
 
 export const getOperationColumnNames = (
-  columns: readonly Column[],
+  columns: readonly DisplayColumn[],
   operationType: AggregationOperation,
   selected: readonly string[],
   invert: boolean
diff --git a/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx b/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx
index 7b8686e3a9..9bc4955f01 100644
--- a/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx
+++ b/packages/iris-grid/src/sidebar/visibility-ordering-builder/VisibilityOrderingBuilder.tsx
@@ -29,7 +29,7 @@ import { Button, SearchInput } from '@deephaven/components';
 import clamp from 'lodash.clamp';
 import throttle from 'lodash.throttle';
 import './VisibilityOrderingBuilder.scss';
-import IrisGridModel from '../../IrisGridModel';
+import IrisGridModel, { DisplayColumn } from '../../IrisGridModel';
 import { ColumnName } from '../../CommonTypes';
 import ColumnHeaderGroup from '../../ColumnHeaderGroup';
 import VisibilityOrderingItem from './VisibilityOrderingItem';
@@ -92,6 +92,11 @@ class VisibilityOrderingBuilder extends PureComponent<
     DOWN: 'DOWN',
   } as const;
 
+  static shouldRenderColumn(column: DisplayColumn): boolean {
+    // We don't want to render the proxy column in the visibility ordering list
+    return column.isProxy !== true;
+  }
+
   constructor(props: VisibilityOrderingBuilderProps) {
     super(props);
 
@@ -1081,7 +1086,10 @@ class VisibilityOrderingBuilder extends PureComponent<
   }
 
   makeVisibilityOrderingList = memoize(
-    (columns: readonly Column[], treeItems: readonly IrisGridTreeItem[]) => {
+    (
+      columns: readonly DisplayColumn[],
+      treeItems: readonly IrisGridTreeItem[]
+    ) => {
       const { movedColumns } = this.props;
 
       const elements = [];
@@ -1117,7 +1125,9 @@ class VisibilityOrderingBuilder extends PureComponent<
             movedColumns
           );
           const column = columns[modelIndex];
-          elements.push(this.renderImmovableItem(column.name));
+          if (VisibilityOrderingBuilder.shouldRenderColumn(column)) {
+            elements.push(this.renderImmovableItem(column.name));
+          }
         }
 
         return elements;
@@ -1131,7 +1141,9 @@ class VisibilityOrderingBuilder extends PureComponent<
       ) {
         const modelIndex = GridUtils.getModelIndex(visibleIndex, movedColumns);
         const column = columns[modelIndex];
-        elements.push(this.renderImmovableItem(column.name));
+        if (VisibilityOrderingBuilder.shouldRenderColumn(column)) {
+          elements.push(this.renderImmovableItem(column.name));
+        }
       }
 
       if (firstMovableIndex !== null && firstMovableIndex > 0) {
@@ -1159,7 +1171,9 @@ class VisibilityOrderingBuilder extends PureComponent<
       ) {
         const modelIndex = GridUtils.getModelIndex(visibleIndex, movedColumns);
         const column = columns[modelIndex];
-        elements.push(this.renderImmovableItem(column.name));
+        if (VisibilityOrderingBuilder.shouldRenderColumn(column)) {
+          elements.push(this.renderImmovableItem(column.name));
+        }
       }
 
       return elements;
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-chromium-linux.png
index b780e4cbbb..ef7b869a44 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-firefox-linux.png
index 23bd07d68b..d480a2c5d7 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-webkit-linux.png
index 8446e49fd5..4642d765a5 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-1-webkit-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-chromium-linux.png
index 08ccdd76d3..8bdf83b996 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-firefox-linux.png
index a0880f72d3..fb1855a951 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-webkit-linux.png
index 47370be3ba..5a9b0c26dc 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-2-webkit-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-chromium-linux.png
index 72161db66f..1b55f98f53 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-firefox-linux.png
index ff7ea1c4b1..58b9498c9b 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-webkit-linux.png
index 1717ae9bdc..493caa5179 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-3-webkit-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-chromium-linux.png
index c46011cf3c..ba74ee0c0e 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-firefox-linux.png
index 3e57774343..356f90b625 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-webkit-linux.png
index 39a8098eee..ff3d7d7cf3 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-4-webkit-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-chromium-linux.png
index 1ea62c210f..7a2e7019bc 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-firefox-linux.png
index 832efd0b29..d86a1756d8 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-webkit-linux.png
index 099ae4b89d..954dd90018 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-5-webkit-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-chromium-linux.png
index 09b7dbfc69..06396a043d 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-firefox-linux.png
index 0d118afe91..9944b95874 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-webkit-linux.png
index 96263e72ec..2384f809b8 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-6-webkit-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-chromium-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-chromium-linux.png
index f384881e5d..1251f7e1c0 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-chromium-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-chromium-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-firefox-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-firefox-linux.png
index b7686d07b0..1b2e931291 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-firefox-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-firefox-linux.png differ
diff --git a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-webkit-linux.png b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-webkit-linux.png
index 03917650b2..e94b5764fd 100644
Binary files a/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-webkit-linux.png and b/tests/table-operations.spec.ts-snapshots/rollup-rows-and-aggregrate-columns-7-webkit-linux.png differ