diff --git a/src/plugins/vis_type_table/public/components/table_vis_app.scss b/src/plugins/vis_type_table/public/components/table_vis_app.scss
index 9db3aa542f09..aafcd40e7382 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_app.scss
+++ b/src/plugins/vis_type_table/public/components/table_vis_app.scss
@@ -23,7 +23,7 @@
 }
 
 // Modifier for visTables__group when displayed in columns
-.visTable__group--columns {
+.visTable__groupInColumns {
   flex-direction: row;
   align-items: flex-start;
 }
diff --git a/src/plugins/vis_type_table/public/components/table_vis_app.test.tsx b/src/plugins/vis_type_table/public/components/table_vis_app.test.tsx
index d5c27f574909..37cb753765f8 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_app.test.tsx
+++ b/src/plugins/vis_type_table/public/components/table_vis_app.test.tsx
@@ -75,7 +75,7 @@ describe('TableVisApp', () => {
         handlers={handlersMock}
       />
     );
-    expect(container.outerHTML.includes('visTable visTable__group--columns')).toBe(true);
+    expect(container.outerHTML.includes('visTable visTable__groupInColumns')).toBe(true);
     expect(getByTestId('TableVisComponentGroup')).toBeInTheDocument();
   });
 
diff --git a/src/plugins/vis_type_table/public/components/table_vis_app.tsx b/src/plugins/vis_type_table/public/components/table_vis_app.tsx
index 205dd68738c3..81f4d775f1e5 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_app.tsx
+++ b/src/plugins/vis_type_table/public/components/table_vis_app.tsx
@@ -15,8 +15,7 @@ import { TableVisData } from '../table_vis_response_handler';
 import { TableVisConfig } from '../types';
 import { TableVisComponent } from './table_vis_component';
 import { TableVisComponentGroup } from './table_vis_component_group';
-import { getTableUIState } from '../utils/get_table_ui_state';
-import { TableUiState } from '../utils/get_table_ui_state';
+import { getTableUIState, TableUiState } from '../utils';
 
 interface TableVisAppProps {
   services: CoreStart;
@@ -38,7 +37,7 @@ export const TableVisApp = ({
 
   const className = classNames('visTable', {
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    'visTable__group--columns': direction === 'column',
+    visTable__groupInColumns: direction === 'column',
   });
 
   const tableUiState: TableUiState = getTableUIState(handlers.uiState as PersistedState);
diff --git a/src/plugins/vis_type_table/public/components/table_vis_cell.tsx b/src/plugins/vis_type_table/public/components/table_vis_cell.tsx
index 8ff96285e229..30c0877df701 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_cell.tsx
+++ b/src/plugins/vis_type_table/public/components/table_vis_cell.tsx
@@ -20,7 +20,7 @@ export const getTableVisCellValue = (
   if (!row || !row.hasOwnProperty(columnId)) {
     return null;
   }
-  const rawContent = sortedRows[rowIndex][columnId];
+  const rawContent = row[columnId];
   const colIndex = columns.findIndex((col) => col.id === columnId);
   const htmlContent = columns[colIndex].formatter.convert(rawContent, 'html');
   const formattedContent = (
diff --git a/src/plugins/vis_type_table/public/components/table_vis_component.tsx b/src/plugins/vis_type_table/public/components/table_vis_component.tsx
index 06f99a1a7e29..1b16ec170a84 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_component.tsx
+++ b/src/plugins/vis_type_table/public/components/table_vis_component.tsx
@@ -14,7 +14,7 @@ import { getDataGridColumns } from './table_vis_grid_columns';
 import { getTableVisCellValue } from './table_vis_cell';
 import { usePagination } from '../utils';
 import { TableVisControl } from './table_vis_control';
-import { TableUiState } from '../utils/get_table_ui_state';
+import { TableUiState } from '../utils';
 
 interface TableVisComponentProps {
   title?: string;
@@ -48,10 +48,10 @@ export const TableVisComponent = ({
     }
   }, [formattedColumns, rows, sort]);
 
-  const renderCellValue = useMemo(
-    () => getTableVisCellValue(sortedRows, formattedColumns) as EuiDataGridProps['renderCellValue'],
-    [sortedRows, formattedColumns]
-  );
+  const renderCellValue = useMemo(() => getTableVisCellValue(sortedRows, formattedColumns), [
+    sortedRows,
+    formattedColumns,
+  ]);
 
   const dataGridColumns = getDataGridColumns(table, event, colWidth);
 
diff --git a/src/plugins/vis_type_table/public/components/table_vis_component_group.tsx b/src/plugins/vis_type_table/public/components/table_vis_component_group.tsx
index 26afecc3a974..af8fd8048cbc 100644
--- a/src/plugins/vis_type_table/public/components/table_vis_component_group.tsx
+++ b/src/plugins/vis_type_table/public/components/table_vis_component_group.tsx
@@ -9,7 +9,7 @@ import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
 import { TableGroup } from '../table_vis_response_handler';
 import { TableVisConfig } from '../types';
 import { TableVisComponent } from './table_vis_component';
-import { TableUiState } from '../utils/get_table_ui_state';
+import { TableUiState } from '../utils';
 
 interface TableVisGroupComponentProps {
   tableGroups: TableGroup[];