dataframe-textual 1.12.0__py3-none-any.whl → 2.0.0__py3-none-any.whl

dataframe_textual/data_frame_table.py

@@ -3,13 +3,14 @@
 import sys
 from collections import defaultdict, deque
 from dataclasses import dataclass
+from itertools import zip_longest
 from pathlib import Path
 from textwrap import dedent
 from typing import Any
 
 import polars as pl
-from rich.text import Text
-from textual import work
+from rich.text import Text, TextType
+from textual._two_way_dict import TwoWayDict
 from textual.coordinate import Coordinate
 from textual.events import Click
 from textual.reactive import reactive
@@ -18,8 +19,11 @@ from textual.widgets import DataTable, TabPane
 from textual.widgets._data_table import (
     CellDoesNotExist,
     CellKey,
+    CellType,
     ColumnKey,
     CursorType,
+    DuplicateKey,
+    Row,
     RowKey,
 )
 
@@ -27,19 +31,19 @@ from .common import (
     CURSOR_TYPES,
     NULL,
     NULL_DISPLAY,
-    RIDX,
+    RID,
     SUBSCRIPT_DIGITS,
     SUPPORTED_FORMATS,
     DtypeConfig,
     format_row,
     get_next_item,
     parse_placeholders,
-    sleep_async,
+    round_to_nearest_hundreds,
     tentative_expr,
     validate_expr,
 )
 from .sql_screen import AdvancedSqlScreen, SimpleSqlScreen
-from .table_screen import FrequencyScreen, RowDetailScreen, StatisticsScreen
+from .table_screen import FrequencyScreen, MetaColumnScreen, MetaShape, RowDetailScreen, StatisticsScreen
 from .yes_no_screen import (
     AddColumnScreen,
     AddLinkScreen,
@@ -57,6 +61,9 @@ from .yes_no_screen import (
 # Color for highlighting selections and matches
 HIGHLIGHT_COLOR = "red"
 
+# Buffer size for loading rows
+BUFFER_SIZE = 5
+
 # Warning threshold for loading rows
 WARN_ROWS_THRESHOLD = 50_000
 
@@ -70,16 +77,16 @@ class History:
 
     description: str
     df: pl.DataFrame
+    df_view: pl.DataFrame | None
     filename: str
     loaded_rows: int
-    sorted_columns: dict[str, bool]
     hidden_columns: set[str]
-    selected_rows: list[bool]
-    visible_rows: list[bool]
+    selected_rows: set[int]
+    sorted_columns: dict[str, bool]  # col_name -> descending
     fixed_rows: int
     fixed_columns: int
     cursor_coordinate: Coordinate
-    matches: dict[int, set[int]]
+    matches: dict[int, set[str]]  # RID -> set of col names
     dirty: bool = False  # Whether this history state has unsaved changes
 
 
@@ -115,7 +122,7 @@ class DataFrameTable(DataTable):
         - **g** - ⬆️ Jump to first row
         - **G** - ⬇️ Jump to last row
         - **HOME/END** - 🎯 Jump to first/last column
-        - **Ctrl+HOME/END** - 🎯 Jump to page top/bottom
+        - **Ctrl+HOME/END** - 🎯 Jump to page top/top
         - **Ctrl+F** - 📜 Page down
         - **Ctrl+B** - 📜 Page up
         - **PgUp/PgDn** - 📜 Page up/down
@@ -125,11 +132,13 @@ class DataFrameTable(DataTable):
         - **U** - 🔄 Redo last undone action
         - **Ctrl+U** - 🔁 Reset to initial state
 
-        ## 👁️ Viewing & Display
+        ## 👁️ Display
         - **Enter** - 📋 Show row details in modal
         - **F** - 📊 Show frequency distribution
         - **s** - 📈 Show statistics for current column
         - **S** - 📊 Show statistics for entire dataframe
+        - **m** - 📐 Show dataframe metadata (row/column counts)
+        - **M** - 📋 Show column metadata (ID, name, type)
         - **h** - 👁️ Hide current column
         - **H** - 👀 Show all hidden rows/columns
         - **_** - 📏 Expand column to full width
@@ -143,31 +152,31 @@ class DataFrameTable(DataTable):
         - **]** - 🔽 Sort column descending
         - *(Multi-column sort supported)*
 
-        ## 🔍 Searching & Filtering
-        - **|** - 🔎 Search in current column with expression
-        - **\\\\** - 🔎 Search in current column using cursor value
+        ## ✅ Row Selection
+        - **\\\\** - ✅ Select rows with cell matches or those matching cursor value in current column
+        - **|** - ✅ Select rows with expression
+        - **'** - ✅ Select/deselect current row
+        - **t** - 💡 Toggle row selection (invert all)
+        - **T** - 🧹 Clear all selections and matches
+        - **{** - ⬆️ Go to previous selected row
+        - **}** - ⬇️ Go to next selected row
+        - *(Supports case-insensitive & whole-word matching)*
+
+        ## 🔎 Find & Replace
         - **/** - 🔎 Find in current column with cursor value
         - **?** - 🔎 Find in current column with expression
         - **;** - 🌐 Global find using cursor value
         - **:** - 🌐 Global find with expression
         - **n** - ⬇️ Go to next match
         - **N** - ⬆️ Go to previous match
-        - **v** - 👁️ View/filter rows by cell or selected rows and hide others
-        - **V** - 🔧 View/filter rows by expression and hide others
-        - *(All search/find support case-insensitive & whole-word matching)*
-
-        ## ✏️ Replace
         - **r** - 🔄 Replace in current column (interactive or all)
         - **R** - 🔄 Replace across all columns (interactive or all)
         - *(Supports case-insensitive & whole-word matching)*
 
-        ## ✅ Selection & Filter
-        - **'** - ✓️ Select/deselect current row
-        - **t** - 💡 Toggle row selection (invert all)
-        - **T** - 🧹 Clear all selections and matches
-        - **{** - ⬆️ Go to previous selected row
-        - **}** - ⬇️ Go to next selected row
-        - **"** - 📍 Filter selected rows and remove others
+        ## 👁️ View & Filter
+        - **"** - 📍 Filter selected rows (removes others)
+        - **v** - 👁️ View selected rows (hides others)
+        - **V** - 🔧 View selected rows matching expression (hides others)
 
         ## 🔍 SQL Interface
         - **l** - 💬 Open simple SQL interface (select columns & where clause)
@@ -210,8 +219,8 @@ class DataFrameTable(DataTable):
         # Navigation
         ("g", "jump_top", "Jump to top"),
         ("G", "jump_bottom", "Jump to bottom"),
-        ("ctrl+f", "forward_page", "Page down"),
-        ("ctrl+b", "backward_page", "Page up"),
+        ("pageup,ctrl+b", "page_up", "Page up"),
+        ("pagedown,ctrl+f", "page_down", "Page down"),
         # Undo/Redo/Reset
         ("u", "undo", "Undo"),
         ("U", "redo", "Redo"),
@@ -224,13 +233,16 @@ class DataFrameTable(DataTable):
         ("z", "freeze_row_column", "Freeze rows/columns"),
         ("comma", "show_thousand_separator", "Toggle thousand separator"),  # `,`
         ("underscore", "expand_column", "Expand column to full width"),  # `_`
+        ("circumflex_accent", "toggle_rid", "Toggle internal row index"),  # `^`
         # Copy
         ("c", "copy_cell", "Copy cell to clipboard"),
         ("ctrl+c", "copy_column", "Copy column to clipboard"),
         ("ctrl+r", "copy_row", "Copy row to clipboard"),
         # Save
         ("ctrl+s", "save_to_file", "Save to file"),
-        # Detail, Frequency, and Statistics
+        # Metadata, Detail, Frequency, and Statistics
+        ("m", "metadata_shape", "Show metadata for row count and column count"),
+        ("M", "metadata_column", "Show metadata for column"),
         ("enter", "view_row_detail", "View row details"),
         ("F", "show_frequency", "Show frequency"),
         ("s", "show_statistics", "Show statistics for column"),
@@ -239,28 +251,26 @@ class DataFrameTable(DataTable):
         ("left_square_bracket", "sort_ascending", "Sort ascending"),  # `[`
         ("right_square_bracket", "sort_descending", "Sort descending"),  # `]`
         # View & Filter
-        ("v", "view_rows", "View rows"),
-        ("V", "view_rows_expr", "View rows by expression"),
-        ("quotation_mark", "filter_rows", "Filter selected"),  # `"`
-        # Search
-        ("backslash", "search_cursor_value", "Search column with cursor value"),  # `\`
-        ("vertical_line", "search_expr", "Search column with expression"),  # `|`
+        ("v", "view_rows", "View selected rows"),
+        ("V", "view_rows_expr", "View selected rows matching expression"),
+        ("quotation_mark", "filter_rows", "Filter selected rows"),  # `"`
+        # Row Selection
+        ("backslash", "select_row", "Select rows with cell matches or those matching cursor value in current column"),  # `\`
+        ("vertical_line", "select_row_expr", "Select rows with expression"),  # `|`
         ("right_curly_bracket", "next_selected_row", "Go to next selected row"),  # `}`
         ("left_curly_bracket", "previous_selected_row", "Go to previous selected row"),  # `{`
-        # Find
+        ("apostrophe", "toggle_row_selection", "Toggle row selection"),  # `'`
+        ("t", "toggle_selections", "Toggle all row selections"),
+        ("T", "clear_selections_and_matches", "Clear selections"),
+        # Find & Replace
         ("slash", "find_cursor_value", "Find in column with cursor value"),  # `/`
         ("question_mark", "find_expr", "Find in column with expression"),  # `?`
         ("semicolon", "find_cursor_value('global')", "Global find with cursor value"),  # `;`
         ("colon", "find_expr('global')", "Global find with expression"),  # `:`
         ("n", "next_match", "Go to next match"),  # `n`
         ("N", "previous_match", "Go to previous match"),  # `Shift+n`
-        # Replace
         ("r", "replace", "Replace in column"),  # `r`
         ("R", "replace_global", "Replace global"),  # `Shift+R`
-        # Selection
-        ("apostrophe", "toggle_row_selection", "Toggle row selection"),  # `'`
-        ("t", "toggle_selections", "Toggle all row selections"),
-        ("T", "clear_selections_and_matches", "Clear selections"),
         # Delete
         ("delete", "clear_cell", "Clear cell"),
         ("minus", "delete_column", "Delete column"),  # `-`
@@ -311,34 +321,40 @@ class DataFrameTable(DataTable):
         super().__init__(**kwargs)
 
         # DataFrame state
-        self.dataframe = df  # Original dataframe
-        self.df = df  # Internal/working dataframe
+        self.dataframe = df.lazy().with_row_index(RID).select(pl.exclude(RID), RID).collect()  # Original dataframe
+        self.df = self.dataframe  # Internal/working dataframe
         self.filename = filename or "untitled.csv"  # Current filename
         self.tabname = tabname or Path(filename).stem  # Tab name
+
+        # In view mode, this is the copy of self.df
+        self.df_view = None
+
         # Pagination & Loading
-        self.INITIAL_BATCH_SIZE = (self.app.size.height // 100 + 1) * 100
-        self.BATCH_SIZE = self.INITIAL_BATCH_SIZE // 2
+        self.BATCH_SIZE = max((self.app.size.height // 100 + 1) * 100, 100)
         self.loaded_rows = 0  # Track how many rows are currently loaded
+        self.loaded_ranges: list[tuple[int, int]] = []  # List of (start, end) row indices that are loaded
 
         # State tracking (all 0-based indexing)
-        self.sorted_columns: dict[str, bool] = {}  # col_name -> descending
         self.hidden_columns: set[str] = set()  # Set of hidden column names
-        self.selected_rows: list[bool] = [False] * len(self.df)  # Track selected rows
-        self.visible_rows: list[bool] = [True] * len(self.df)  # Track visible rows (for filtering)
-        self.matches: dict[int, set[int]] = defaultdict(set)  # Track search matches: row_idx -> set of col_idx
+        self.selected_rows: set[int] = set()  # Track selected rows by RID
+        self.sorted_columns: dict[str, bool] = {}  # col_name -> descending
+        self.matches: dict[int, set[str]] = defaultdict(set)  # Track search matches: RID -> set of col_names
 
         # Freezing
         self.fixed_rows = 0  # Number of fixed rows
         self.fixed_columns = 0  # Number of fixed columns
 
         # History stack for undo
-        self.histories: deque[History] = deque()
-        # Current history state for redo
-        self.history: History = None
+        self.histories_undo: deque[History] = deque()
+        # History stack for redo
+        self.histories_redo: deque[History] = deque()
 
         # Whether to use thousand separator for numeric display
         self.thousand_separator = False
 
+        # Whether to show internal row index column
+        self.show_rid = False
+
     @property
     def cursor_key(self) -> CellKey:
         """Get the current cursor position as a CellKey.
@@ -405,22 +421,13 @@ class DataFrameTable(DataTable):
 
     @property
     def cursor_value(self) -> Any:
-        """Get the current cursor cell value.
+        """Get the current cursor cell value in the dataframe.
 
         Returns:
             Any: The value of the cell at the cursor position.
         """
         return self.df.item(self.cursor_row_idx, self.cursor_col_idx)
 
-    @property
-    def has_hidden_rows(self) -> bool:
-        """Check if there are any hidden rows.
-
-        Returns:
-            bool: True if there are hidden rows, False otherwise.
-        """
-        return any(v for v in self.visible_rows if v is False)
-
     @property
     def ordered_selected_rows(self) -> list[int]:
         """Get the list of selected row indices in order.
@@ -428,7 +435,7 @@ class DataFrameTable(DataTable):
         Returns:
             list[int]: A list of 0-based row indices that are currently selected.
         """
-        return [ridx for ridx, selected in enumerate(self.selected_rows) if selected]
+        return [ridx for ridx, rid in enumerate(self.df[RID]) if rid in self.selected_rows]
 
     @property
     def ordered_matches(self) -> list[tuple[int, int]]:
@@ -438,19 +445,38 @@ class DataFrameTable(DataTable):
             list[tuple[int, int]]: A list of (row_idx, col_idx) tuples for matched cells.
         """
         matches = []
-        for ridx in sorted(self.matches.keys()):
-            for cidx in sorted(self.matches[ridx]):
-                matches.append((ridx, cidx))
+
+        # Uniq columns
+        cols_to_check = set()
+        for cols in self.matches.values():
+            cols_to_check.update(cols)
+
+        # Ordered columns
+        cidx2col = {cidx: col for cidx, col in enumerate(self.df.columns) if col in cols_to_check}
+
+        for ridx, rid in enumerate(self.df[RID]):
+            if cols := self.matches.get(rid):
+                for cidx, col in cidx2col.items():
+                    if col in cols:
+                        matches.append((ridx, cidx))
+
         return matches
 
-    @property
-    def last_history(self) -> History:
-        """Get the last history state.
+    def _round_to_nearest_hundreds(self, num: int):
+        """Round a number to the nearest hundreds.
 
-        Returns:
-            History: The most recent History object from the histories deque.
+        Args:
+            num: The number to round.
         """
-        return self.histories[-1] if self.histories else None
+        return round_to_nearest_hundreds(num, N=self.BATCH_SIZE)
+
+    def get_row_idx(self, row_key: RowKey) -> int:
+        """Get the row index for a given table row key.
+
+        Args:
+            row_key: Row key as string.
+        """
+        return super().get_row_index(row_key)
 
     def get_row_key(self, row_idx: int) -> RowKey:
         """Get the row key for a given table row index.
@@ -463,7 +489,18 @@ class DataFrameTable(DataTable):
         """
         return self._row_locations.get_key(row_idx)
 
-    def get_column_key(self, col_idx: int) -> ColumnKey:
+    def get_col_idx(self, col_key: ColumnKey) -> int:
+        """Get the column index for a given table column key.
+
+        Args:
+            col_key: Column key as string.
+
+        Returns:
+            Corresponding column index as int.
+        """
+        return super().get_column_index(col_key)
+
+    def get_col_key(self, col_idx: int) -> ColumnKey:
         """Get the column key for a given table column index.
 
         Args:
@@ -474,11 +511,11 @@ class DataFrameTable(DataTable):
         """
         return self._column_locations.get_key(col_idx)
 
-    def should_highlight(self, cursor: Coordinate, target_cell: Coordinate, type_of_cursor: CursorType) -> bool:
+    def _should_highlight(self, cursor: Coordinate, target_cell: Coordinate, type_of_cursor: CursorType) -> bool:
         """Determine if the given cell should be highlighted because of the cursor.
 
-        In "cell" mode, also highlights the row and column headers. In "row" and "column"
-        modes, highlights the entire row or column respectively.
+        In "cell" mode, also highlights the row and column headers. This overrides the default
+        behavior of DataTable which only highlights the exact cell under the cursor.
 
         Args:
             cursor: The current position of the cursor.
@@ -575,7 +612,7 @@ class DataFrameTable(DataTable):
             else:
                 content_tab.remove_class("dirty")
 
-    def move_cursor_to(self, ridx: int, cidx: int) -> None:
+    def move_cursor_to(self, ridx: int | None = None, cidx: int | None = None) -> None:
         """Move cursor based on the dataframe indices.
 
         Args:
@@ -583,11 +620,11 @@ class DataFrameTable(DataTable):
             cidx: Column index (0-based) in the dataframe.
         """
         # Ensure the target row is loaded
-        if ridx >= self.loaded_rows:
-            self.load_rows(stop=ridx + self.BATCH_SIZE)
+        start, stop = self._round_to_nearest_hundreds(ridx)
+        self.load_rows_range(start, stop)
 
-        row_key = str(ridx)
-        col_key = self.df.columns[cidx]
+        row_key = self.cursor_row_key if ridx is None else str(ridx)
+        col_key = self.cursor_col_key if cidx is None else self.df.columns[cidx]
         row_idx, col_idx = self.get_cell_coordinate(row_key, col_key)
         self.move_cursor(row=row_idx, column=col_idx)
 
@@ -603,15 +640,15 @@ class DataFrameTable(DataTable):
     def on_key(self, event) -> None:
         """Handle key press events for pagination.
 
-        Currently handles "pagedown" and "down" keys to trigger lazy loading of additional rows
-        when scrolling near the end of the loaded data.
-
         Args:
             event: The key event object.
         """
-        if event.key in ("pagedown", "down"):
+        if event.key == "up":
+            # Let the table handle the navigation first
+            self.load_rows_up()
+        elif event.key == "down":
             # Let the table handle the navigation first
-            self.check_and_load_more()
+            self.load_rows_down()
 
     def on_click(self, event: Click) -> None:
         """Handle mouse click events on the table.
@@ -624,33 +661,32 @@ class DataFrameTable(DataTable):
         if self.cursor_type == "cell" and event.chain > 1:  # only on double-click or more
             try:
                 row_idx = event.style.meta["row"]
-                # col_idx = event.style.meta["column"]
+                col_idx = event.style.meta["column"]
             except (KeyError, TypeError):
                 return  # Unable to get row/column info
 
             # header row
             if row_idx == -1:
-                self.do_rename_column()
+                self.do_rename_column(col_idx)
             else:
                 self.do_edit_cell()
 
     # Action handlers for BINDINGS
     def action_jump_top(self) -> None:
         """Jump to the top of the table."""
-        self.move_cursor(row=0)
+        self.do_jump_top()
 
     def action_jump_bottom(self) -> None:
         """Jump to the bottom of the table."""
-        self.load_rows(move_to_end=True)
+        self.do_jump_bottom()
 
-    def action_forward_page(self) -> None:
-        """Scroll down one page."""
-        super().action_page_down()
-        self.check_and_load_more()
+    def action_page_up(self) -> None:
+        """Move the cursor one page up."""
+        self.do_page_up()
 
-    def action_backward_page(self) -> None:
-        """Scroll up one page."""
-        super().action_page_up()
+    def action_page_down(self) -> None:
+        """Move the cursor one page down."""
+        self.do_page_down()
 
     def action_view_row_detail(self) -> None:
         """View details of the current row."""
@@ -668,6 +704,10 @@ class DataFrameTable(DataTable):
         """Expand the current column to its full width."""
         self.do_expand_column()
 
+    def action_toggle_rid(self) -> None:
+        """Toggle the internal row index column visibility."""
+        self.do_toggle_rid()
+
     def action_show_hidden_rows_columns(self) -> None:
         """Show all hidden rows/columns."""
         self.do_show_hidden_rows_columns()
@@ -696,6 +736,14 @@ class DataFrameTable(DataTable):
         """
         self.do_show_statistics(scope)
 
+    def action_metadata_shape(self) -> None:
+        """Show metadata about the dataframe (row and column counts)."""
+        self.do_metadata_shape()
+
+    def action_metadata_column(self) -> None:
+        """Show metadata for the current column."""
+        self.do_metadata_column()
+
     def action_view_rows(self) -> None:
         """View rows by current cell value."""
         self.do_view_rows()
@@ -732,13 +780,13 @@ class DataFrameTable(DataTable):
         """Clear the current cell (set to None)."""
         self.do_clear_cell()
 
-    def action_search_cursor_value(self) -> None:
-        """Search cursor value in the current column."""
-        self.do_search_cursor_value()
+    def action_select_row(self) -> None:
+        """Select rows with cursor value in the current column."""
+        self.do_select_row()
 
-    def action_search_expr(self) -> None:
-        """Search by expression in the current column."""
-        self.do_search_expr()
+    def action_select_row_expr(self) -> None:
+        """Select rows by expression."""
+        self.do_select_row_expr()
 
     def action_find_cursor_value(self, scope="column") -> None:
         """Find by cursor value.
@@ -925,9 +973,13 @@ class DataFrameTable(DataTable):
         """Open the advanced SQL interface screen."""
         self.do_advanced_sql()
 
+    def on_mouse_scroll_up(self, event) -> None:
+        """Load more rows when scrolling up with mouse."""
+        self.load_rows_up()
+
     def on_mouse_scroll_down(self, event) -> None:
         """Load more rows when scrolling down with mouse."""
-        self.check_and_load_more()
+        self.load_rows_down()
 
     # Setup & Loading
     def reset_df(self, new_df: pl.DataFrame, dirty: bool = True) -> None:
@@ -940,51 +992,31 @@ class DataFrameTable(DataTable):
         # Set new dataframe and reset table
         self.df = new_df
         self.loaded_rows = 0
-        self.sorted_columns = {}
         self.hidden_columns = set()
-        self.selected_rows = [False] * len(self.df)
-        self.visible_rows = [True] * len(self.df)
+        self.selected_rows = set()
+        self.sorted_columns = {}
         self.fixed_rows = 0
         self.fixed_columns = 0
         self.matches = defaultdict(set)
         # self.histories.clear()
-        # self.history = None
+        # self.histories2.clear()
         self.dirty = dirty  # Mark as dirty since data changed
 
-    def setup_table(self, reset: bool = False) -> None:
+    def setup_table(self) -> None:
         """Setup the table for display.
 
         Row keys are 0-based indices, which map directly to dataframe row indices.
         Column keys are header names from the dataframe.
         """
         self.loaded_rows = 0
+        self.loaded_ranges.clear()
         self.show_row_labels = True
 
-        # Reset to original dataframe
-        if reset:
-            self.reset_df(self.dataframe, dirty=False)
-
-        # Lazy load up to INITIAL_BATCH_SIZE visible rows
-        stop, visible_count, row_idx = self.INITIAL_BATCH_SIZE, 0, 0
-        for row_idx, visible in enumerate(self.visible_rows):
-            if not visible:
-                continue
-            visible_count += 1
-            if visible_count > self.INITIAL_BATCH_SIZE:
-                stop = row_idx + self.BATCH_SIZE
-                break
-        else:
-            stop = row_idx + self.BATCH_SIZE
-
-        # # Ensure all selected rows or matches are loaded
-        # stop = max(stop, rindex(self.selected_rows, True) + 1)
-        # stop = max(stop, max(self.matches.keys(), default=0) + 1)
-
         # Save current cursor position before clearing
         row_idx, col_idx = self.cursor_coordinate
 
         self.setup_columns()
-        self.load_rows(stop)
+        self.load_rows_range(0, self.BATCH_SIZE)  # Load initial rows
 
         # Restore cursor position
         if row_idx < len(self.rows) and col_idx < len(self.columns):
@@ -1007,7 +1039,7 @@ class DataFrameTable(DataTable):
         column_widths = {}
 
         # Get available width for the table (with some padding for borders/scrollbar)
-        available_width = self.size.width - 4  # Account for borders and scrollbar
+        available_width = self.scrollable_content_region.width
 
         # Calculate how much width we need for string columns first
         string_cols = [col for col, dtype in zip(self.df.columns, self.df.dtypes) if dtype == pl.String]
@@ -1017,7 +1049,7 @@ class DataFrameTable(DataTable):
             return column_widths
 
         # Sample a reasonable number of rows to calculate widths (don't scan entire dataframe)
-        sample_size = min(self.INITIAL_BATCH_SIZE, len(self.df))
+        sample_size = min(self.BATCH_SIZE, len(self.df))
         sample_lf = self.df.lazy().slice(0, sample_size)
 
         # Determine widths for each column
@@ -1028,28 +1060,30 @@ class DataFrameTable(DataTable):
             # Get column label width
             # Add padding for sort indicators if any
             label_width = measure(self.app.console, col, 1) + 2
+            if dtype != pl.String:
+                available_width -= label_width
+                continue
 
             try:
                 # Get sample values from the column
-                sample_values = sample_lf.select(col).collect().get_column(col).to_list()
+                sample_values = sample_lf.select(col).collect().get_column(col).drop_nulls().to_list()
                 if any(val.startswith(("https://", "http://")) for val in sample_values):
                     continue  # Skip link columns so they can auto-size and be clickable
 
                 # Find maximum width in sample
                 max_cell_width = max(
-                    (measure(self.app.console, str(val), 1) for val in sample_values if val),
+                    (measure(self.app.console, val, 1) for val in sample_values),
                     default=label_width,
                 )
 
                 # Set column width to max of label and sampled data (capped at reasonable max)
                 max_width = max(label_width, max_cell_width)
-            except Exception:
+            except Exception as e:
                 # If any error, let Textual auto-size
                 max_width = label_width
+                self.log(f"Error determining width for column '{col}': {e}")
 
-            if dtype == pl.String:
-                column_widths[col] = max_width
-
+            column_widths[col] = max_width
             available_width -= max_width
 
         # If there's no more available width, auto-size remaining columns
@@ -1073,8 +1107,8 @@ class DataFrameTable(DataTable):
 
         # Add columns with justified headers
         for col, dtype in zip(self.df.columns, self.df.dtypes):
-            if col in self.hidden_columns:
-                continue  # Skip hidden columns
+            if col in self.hidden_columns or (col == RID and not self.show_rid):
+                continue  # Skip hidden columns and internal RID
             for idx, c in enumerate(self.sorted_columns, 1):
                 if c == col:
                     # Add sort indicator to column header
@@ -1092,128 +1126,390 @@ class DataFrameTable(DataTable):
 
             self.add_column(Text(cell_value, justify=DtypeConfig(dtype).justify), key=col, width=width)
 
-    def load_rows(self, stop: int | None = None, move_to_end: bool = False) -> None:
-        """Load a batch of rows into the table (synchronous wrapper).
+    def _calculate_load_range(self, start: int, stop: int) -> list[tuple[int, int]]:
+        """Calculate the actual ranges to load, accounting for already-loaded ranges.
+
+        Handles complex cases where a loaded range is fully contained within the requested
+        range (creating head and tail segments to load). All overlapping/adjacent loaded
+        ranges are merged first to minimize gaps.
 
         Args:
-            stop: Stop loading rows when this index is reached.
-                  If None, load until the end of the dataframe.
+            start: Requested start index (0-based).
+            stop: Requested stop index (0-based, exclusive).
+
+        Returns:
+            List of (actual_start, actual_stop) tuples to load. Empty list if the entire
+            requested range is already loaded.
+
+        Example:
+            If loaded ranges are [(150, 250)] and requesting (100, 300):
+            - Returns [(100, 150), (250, 300)] to load head and tail
+            If loaded ranges are [(0, 100), (100, 200)] and requesting (50, 150):
+            - After merging, loaded_ranges becomes [(0, 200)]
+            - Returns [] (already fully loaded)
         """
-        if stop is None or stop > len(self.df):
-            stop = len(self.df)
+        if not self.loaded_ranges:
+            return [(start, stop)]
+
+        # Sort loaded ranges by start index
+        sorted_ranges = sorted(self.loaded_ranges)
+
+        # Merge overlapping/adjacent ranges
+        merged = []
+        for range_start, range_stop in sorted_ranges:
+            # Fully covered, no need to load anything
+            if range_start <= start and range_stop >= stop:
+                return []
+            # Overlapping or adjacent: merge
+            elif merged and range_start <= merged[-1][1]:
+                merged[-1] = (merged[-1][0], max(merged[-1][1], range_stop))
+            else:
+                merged.append((range_start, range_stop))
+
+        self.loaded_ranges = merged
+
+        # Calculate ranges to load by finding gaps in the merged ranges
+        ranges_to_load = []
+        current_pos = start
+
+        for range_start, range_stop in merged:
+            # If there's a gap before this loaded range, add it to load list
+            if current_pos < range_start and current_pos < stop:
+                gap_end = min(range_start, stop)
+                ranges_to_load.append((current_pos, gap_end))
+                current_pos = range_stop
+            elif current_pos >= range_stop:
+                # Already moved past this loaded range
+                continue
+            else:
+                # Current position is inside this loaded range, skip past it
+                current_pos = max(current_pos, range_stop)
 
-        # If already loaded enough rows, just move cursor if needed
-        if stop <= self.loaded_rows:
-            if move_to_end:
-                self.move_cursor(row=self.row_count - 1)
+        # If there's remaining range after all loaded ranges, add it
+        if current_pos < stop:
+            ranges_to_load.append((current_pos, stop))
 
+        return ranges_to_load
+
+    def _merge_loaded_ranges(self) -> None:
+        """Merge adjacent and overlapping ranges in self.loaded_ranges.
+
+        Ranges like (0, 100) and (100, 200) are merged into (0, 200).
+        """
+        if len(self.loaded_ranges) <= 1:
             return
 
-        # Warn user if loading a large number of rows
-        elif (nrows := stop - self.loaded_rows) >= WARN_ROWS_THRESHOLD:
+        # Sort by start index
+        sorted_ranges = sorted(self.loaded_ranges)
 
-            def _continue(result: bool) -> None:
-                if result:
-                    self.load_rows_async(stop, move_to_end=move_to_end)
+        # Merge overlapping/adjacent ranges
+        merged = [sorted_ranges[0]]
+        for range_start, range_stop in sorted_ranges[1:]:
+            # Overlapping or adjacent: merge
+            if range_start <= merged[-1][1]:
+                merged[-1] = (merged[-1][0], max(merged[-1][1], range_stop))
+            else:
+                merged.append((range_start, range_stop))
 
-            self.app.push_screen(
-                ConfirmScreen(
-                    f"Load {nrows} Rows",
-                    label="Loading a large number of rows may cause the application to become unresponsive. Do you want to continue?",
-                ),
-                callback=_continue,
-            )
+        self.loaded_ranges = merged
 
-            return
+    def _find_insert_position_for_row(self, ridx: int) -> int:
+        """Find the correct table position to insert a row with the given dataframe index.
+
+        In the table display, rows are ordered by their dataframe index, regardless of
+        the internal row keys. This method finds where a row should be inserted based on
+        its dataframe index and the indices of already-loaded rows.
+
+        Args:
+            ridx: The 0-based dataframe row index.
+
+        Returns:
+            The 0-based table position where the row should be inserted.
+        """
+        # Count how many already-loaded rows have lower dataframe indices
+        # Iterate through loaded rows instead of iterating 0..ridx for efficiency
+        insert_pos = 0
+        for row_key in self._row_locations:
+            loaded_ridx = int(row_key.value)
+            if loaded_ridx < ridx:
+                insert_pos += 1
 
-        # Load rows asynchronously
-        self.load_rows_async(stop, move_to_end=move_to_end)
+        return insert_pos
 
-    @work(exclusive=True, description="Loading rows...")
-    async def load_rows_async(self, stop: int, move_to_end: bool = False) -> None:
-        """Perform loading with async to avoid blocking.
+    def load_rows_segment(self, segment_start: int, segment_stop: int) -> int:
+        """Load a single contiguous segment of rows into the table.
+
+        This is the core loading logic that inserts rows at correct positions,
+        respecting visibility and selection states. Used by load_rows_range()
+        to handle each segment independently.
 
         Args:
-            stop: Stop loading rows when this index is reached.
-            move_to_end: If True, move cursor to the last loaded row after loading completes.
+            segment_start: Start loading rows from this index (0-based).
+            segment_stop: Stop loading rows when this index is reached (0-based, exclusive).
         """
-        # Load rows in smaller chunks to avoid blocking
-        if stop > self.loaded_rows:
-            self.log(f"Async loading up to row {self.loaded_rows = }, {stop = }")
-            # Load incrementally to avoid one big block
-            # Load max BATCH_SIZE rows at a time
-            chunk_size = min(self.BATCH_SIZE, stop - self.loaded_rows)
-            next_stop = min(self.loaded_rows + chunk_size, stop)
-            self.load_rows_batch(next_stop)
-
-            # If there's more to load, yield to event loop with delay
-            if next_stop < stop:
-                await sleep_async(0.05)  # 50ms delay to allow UI updates
-                self.load_rows_async(stop, move_to_end=move_to_end)
-                return
+        # Record this range before loading
+        self.loaded_ranges.append((segment_start, segment_stop))
+
+        # Load the dataframe slice
+        df_slice = self.df.slice(segment_start, segment_stop - segment_start)
+
+        # Load each row at the correct position
+        for (ridx, row), rid in zip(enumerate(df_slice.rows(), segment_start), df_slice[RID]):
+            is_selected = rid in self.selected_rows
+            match_cols = self.matches.get(rid, set())
+
+            vals, dtypes, styles = [], [], []
+            for val, col, dtype in zip(row, self.df.columns, self.df.dtypes, strict=True):
+                if col in self.hidden_columns or (col == RID and not self.show_rid):
+                    continue  # Skip hidden columns and internal RID
+
+                vals.append(val)
+                dtypes.append(dtype)
+
+                # Highlight entire row with selection or cells with matches
+                styles.append(HIGHLIGHT_COLOR if is_selected or col in match_cols else None)
+
+            formatted_row = format_row(vals, dtypes, styles=styles, thousand_separator=self.thousand_separator)
+
+            # Find correct insertion position and insert
+            insert_pos = self._find_insert_position_for_row(ridx)
+            self.insert_row(*formatted_row, key=str(ridx), label=str(ridx + 1), position=insert_pos)
+
+        # Number of rows loaded in this segment
+        segment_count = len(df_slice)
 
-        # After loading completes, move cursor to end if requested
-        if move_to_end:
-            self.call_after_refresh(lambda: self.move_cursor(row=self.row_count - 1))
+        # Update loaded rows count
+        self.loaded_rows += segment_count
 
-    def load_rows_batch(self, stop: int) -> None:
+        return segment_count
+
+    def load_rows_range(self, start: int, stop: int) -> int:
         """Load a batch of rows into the table.
 
         Row keys are 0-based indices as strings, which map directly to dataframe row indices.
         Row labels are 1-based indices as strings.
 
+        Intelligently handles range loading:
+        1. Calculates which ranges actually need loading (avoiding reloading)
+        2. Handles complex cases where loaded ranges create "holes" (head and tail segments)
+        3. Inserts rows at correct positions in the table
+        4. Merges adjacent/overlapping ranges to optimize future loading
+
         Args:
-            stop: Stop loading rows when this index is reached.
+            start: Start loading rows from this index (0-based).
+            stop: Stop loading rows when this index is reached (0-based, exclusive).
         """
+        start = max(0, start)  # Clamp to non-negative
+        stop = min(stop, len(self.df))  # Clamp to dataframe length
+
         try:
-            start = self.loaded_rows
-            df_slice = self.df.slice(start, stop - start)
+            # Calculate actual ranges to load, accounting for already-loaded ranges
+            ranges_to_load = self._calculate_load_range(start, stop)
 
-            for ridx, row in enumerate(df_slice.rows(), start):
-                if not self.visible_rows[ridx]:
-                    continue  # Skip hidden rows
+            # If nothing needs loading, return early
+            if not ranges_to_load:
+                return 0  # Already loaded
 
-                is_selected = self.selected_rows[ridx]
-                match_cols = self.matches.get(ridx, set())
+            # Track the number of loaded rows in this range
+            range_count = 0
 
-                vals, dtypes, styles = [], [], []
-                for cidx, (val, col, dtype) in enumerate(zip(row, self.df.columns, self.df.dtypes)):
-                    if col in self.hidden_columns:
-                        continue  # Skip hidden columns
+            # Load each segment
+            for segment_start, segment_stop in ranges_to_load:
+                range_count += self.load_rows_segment(segment_start, segment_stop)
 
-                    vals.append(val)
-                    dtypes.append(dtype)
+            # Merge adjacent/overlapping ranges to optimize storage
+            self._merge_loaded_ranges()
 
-                    # Highlight entire row with selection or cells with matches
-                    styles.append(HIGHLIGHT_COLOR if is_selected or cidx in match_cols else None)
+            self.log(f"Loaded {range_count} rows for range {start}-{stop}/{len(self.df)}")
+            return range_count
 
-                formatted_row = format_row(vals, dtypes, styles=styles, thousand_separator=self.thousand_separator)
+        except Exception as e:
+            self.notify("Error loading rows", title="Load", severity="error", timeout=10)
+            self.log(f"Error loading rows: {str(e)}")
+            return 0
 
-                # Always add labels so they can be shown/hidden via CSS
-                self.add_row(*formatted_row, key=str(ridx), label=str(ridx + 1))
+    def load_rows_up(self) -> None:
+        """Check if we need to load more rows and load them."""
+        # If we've loaded everything, no need to check
+        if self.loaded_rows >= len(self.df):
+            return
 
-            # Update loaded rows count
-            self.loaded_rows = stop
+        top_row_index = int(self.scroll_y) + BUFFER_SIZE
+        top_row_key = self.get_row_key(top_row_index)
 
-            # self.notify(f"Loaded [$accent]{self.loaded_rows}/{len(self.df)}[/] rows from [$success]{self.name}[/]", title="Load")
-            self.log(f"Loaded {self.loaded_rows}/{len(self.df)} rows from `{self.filename or self.name}`")
+        if top_row_key:
+            top_ridx = int(top_row_key.value)
+        else:
+            top_ridx = 0  # No top row key at index, default to 0
 
-        except Exception as e:
-            self.notify("Error loading rows", title="Load", severity="error", timeout=10)
-            self.log(f"Error loading rows: {str(e)}")
+        # Load upward
+        start, stop = self._round_to_nearest_hundreds(top_ridx - BUFFER_SIZE * 2)
+        range_count = self.load_rows_range(start, stop)
+
+        # Adjust scroll to maintain position if rows were loaded above
+        if range_count > 0:
+            self.move_cursor(row=top_row_index + range_count)
+            self.log(f"Loaded up: {range_count} rows in range {start}-{stop}/{len(self.df)}")
 
-    def check_and_load_more(self) -> None:
+    def load_rows_down(self) -> None:
         """Check if we need to load more rows and load them."""
         # If we've loaded everything, no need to check
         if self.loaded_rows >= len(self.df):
             return
 
-        visible_row_count = self.size.height - self.header_height
-        bottom_visible_row = self.scroll_y + visible_row_count
+        visible_row_count = self.scrollable_content_region.height - (self.header_height if self.show_header else 0)
+        bottom_row_index = self.scroll_y + visible_row_count - BUFFER_SIZE
+
+        bottom_row_key = self.get_row_key(bottom_row_index)
+        if bottom_row_key:
+            bottom_ridx = int(bottom_row_key.value)
+        else:
+            bottom_ridx = 0  # No bottom row key at index, default to 0
+
+        # Load downward
+        start, stop = self._round_to_nearest_hundreds(bottom_ridx + BUFFER_SIZE * 2)
+        range_count = self.load_rows_range(start, stop)
+
+        if range_count > 0:
+            self.log(f"Loaded down: {range_count} rows in range {start}-{stop}/{len(self.df)}")
+
+    def insert_row(
+        self,
+        *cells: CellType,
+        height: int | None = 1,
+        key: str | None = None,
+        label: TextType | None = None,
+        position: int | None = None,
+    ) -> RowKey:
+        """Insert a row at a specific position in the DataTable.
+
+        When inserting, all rows at and after the insertion position are shifted down,
+        and their entries in self._row_locations are updated accordingly.
+
+        Args:
+            *cells: Positional arguments should contain cell data.
+            height: The height of a row (in lines). Use `None` to auto-detect the optimal
+                height.
+            key: A key which uniquely identifies this row. If None, it will be generated
+                for you and returned.
+            label: The label for the row. Will be displayed to the left if supplied.
+            position: The 0-based row index where the new row should be inserted.
+                If None, inserts at the end (same as add_row). If out of bounds,
+                inserts at the nearest valid position.
+
+        Returns:
+            Unique identifier for this row. Can be used to retrieve this row regardless
+                of its current location in the DataTable (it could have moved after
+                being added due to sorting or insertion/deletion of other rows).
+
+        Raises:
+            DuplicateKey: If a row with the given key already exists.
+            ValueError: If more cells are provided than there are columns.
+        """
+        # Default to appending if position not specified or >= row_count
+        row_count = self.row_count
+        if position is None or position >= row_count:
+            return self.add_row(*cells, height=height, key=key, label=label)
+
+        # Clamp position to valid range [0, row_count)
+        position = max(0, position)
+
+        row_key = RowKey(key)
+        if row_key in self._row_locations:
+            raise DuplicateKey(f"The row key {row_key!r} already exists.")
+
+        if len(cells) > len(self.ordered_columns):
+            raise ValueError("More values provided than there are columns.")
+
+        # TC: Rebuild self._row_locations to shift rows at and after position down by 1
+        # Create a mapping of old index -> new index
+        old_to_new = {}
+        for old_idx in range(row_count):
+            if old_idx < position:
+                old_to_new[old_idx] = old_idx  # No change
+            else:
+                old_to_new[old_idx] = old_idx + 1  # Shift down by 1
+
+        # Update _row_locations with the new indices
+        new_row_locations = TwoWayDict({})
+        for row_key_item in self._row_locations:
+            old_idx = self.get_row_idx(row_key_item)
+            new_idx = old_to_new.get(old_idx, old_idx)
+            new_row_locations[row_key_item] = new_idx
+
+        # Update the internal mapping
+        self._row_locations = new_row_locations
+        # TC
+
+        row_index = position
+        # Map the key of this row to its current index
+        self._row_locations[row_key] = row_index
+        self._data[row_key] = {column.key: cell for column, cell in zip_longest(self.ordered_columns, cells)}
+
+        label = Text.from_markup(label, end="") if isinstance(label, str) else label
+
+        # Rows with auto-height get a height of 0 because 1) we need an integer height
+        # to do some intermediate computations and 2) because 0 doesn't impact the data
+        # table while we don't figure out how tall this row is.
+        self.rows[row_key] = Row(
+            row_key,
+            height or 0,
+            label,
+            height is None,
+        )
+        self._new_rows.add(row_key)
+        self._require_update_dimensions = True
+        self.cursor_coordinate = self.cursor_coordinate
+
+        # If a position has opened for the cursor to appear, where it previously
+        # could not (e.g. when there's no data in the table), then a highlighted
+        # event is posted, since there's now a highlighted cell when there wasn't
+        # before.
+        cell_now_available = self.row_count == 1 and len(self.columns) > 0
+        visible_cursor = self.show_cursor and self.cursor_type != "none"
+        if cell_now_available and visible_cursor:
+            self._highlight_cursor()
+
+        self._update_count += 1
+        self.check_idle()
+        return row_key
+
+    # Navigation
+    def do_jump_top(self) -> None:
+        """Jump to the top of the table."""
+        self.move_cursor(row=0)
+
+    def do_jump_bottom(self) -> None:
+        """Jump to the bottom of the table."""
+        stop = len(self.df)
+        start = max(0, stop - self.BATCH_SIZE)
 
-        # If visible area is close to the end of loaded rows, load more
-        if bottom_visible_row >= self.loaded_rows - 10:
-            self.load_rows(self.loaded_rows + self.BATCH_SIZE)
+        if start % self.BATCH_SIZE != 0:
+            start = (start // self.BATCH_SIZE + 1) * self.BATCH_SIZE
+
+        self.load_rows_range(start, stop)
+        self.move_cursor(row=self.row_count - 1)
+
+    def do_page_up(self) -> None:
+        """Move the cursor one page up."""
+        self._set_hover_cursor(False)
+        if self.show_cursor and self.cursor_type in ("cell", "row"):
+            height = self.scrollable_content_region.height - (self.header_height if self.show_header else 0)
+
+            col_idx = self.cursor_column
+            ridx = self.cursor_row_idx
+            next_ridx = max(0, ridx - height - BUFFER_SIZE)
+            start, stop = self._round_to_nearest_hundreds(next_ridx)
+            self.load_rows_range(start, stop)
+
+            self.move_cursor(row=self.get_row_idx(str(next_ridx)), column=col_idx)
+        else:
+            super().action_page_up()
+
+    def do_page_down(self) -> None:
+        """Move the cursor one page down."""
+        super().action_page_down()
+        self.load_rows_down()
 
     # History & Undo
     def create_history(self, description: str) -> None:
@@ -1221,12 +1517,12 @@ class DataFrameTable(DataTable):
         return History(
             description=description,
             df=self.df,
+            df_view=self.df_view,
             filename=self.filename,
             loaded_rows=self.loaded_rows,
-            sorted_columns=self.sorted_columns.copy(),
             hidden_columns=self.hidden_columns.copy(),
             selected_rows=self.selected_rows.copy(),
-            visible_rows=self.visible_rows.copy(),
+            sorted_columns=self.sorted_columns.copy(),
             fixed_rows=self.fixed_rows,
             fixed_columns=self.fixed_columns,
             cursor_coordinate=self.cursor_coordinate,
@@ -1241,12 +1537,12 @@ class DataFrameTable(DataTable):
 
         # Restore state
         self.df = history.df
+        self.df_view = history.df_view
         self.filename = history.filename
         self.loaded_rows = history.loaded_rows
-        self.sorted_columns = history.sorted_columns.copy()
         self.hidden_columns = history.hidden_columns.copy()
         self.selected_rows = history.selected_rows.copy()
-        self.visible_rows = history.visible_rows.copy()
+        self.sorted_columns = history.sorted_columns.copy()
         self.fixed_rows = history.fixed_rows
         self.fixed_columns = history.fixed_columns
         self.cursor_coordinate = history.cursor_coordinate
@@ -1256,15 +1552,18 @@ class DataFrameTable(DataTable):
         # Recreate table for display
         self.setup_table()
 
-    def add_history(self, description: str, dirty: bool = False) -> None:
+    def add_history(self, description: str, dirty: bool = False, clear_redo: bool = True) -> None:
         """Add the current state to the history stack.
 
         Args:
             description: Description of the action for this history entry.
             dirty: Whether this operation modifies the data (True) or just display state (False).
         """
-        history = self.create_history(description)
-        self.histories.append(history)
+        self.histories_undo.append(self.create_history(description))
+
+        # Clear redo stack when a new action is performed
+        if clear_redo:
+            self.histories_redo.clear()
 
         # Mark table as dirty if this operation modifies data
         if dirty:
@@ -1272,52 +1571,43 @@ class DataFrameTable(DataTable):
 
     def do_undo(self) -> None:
         """Undo the last action."""
-        if not self.histories:
+        if not self.histories_undo:
             self.notify("No actions to undo", title="Undo", severity="warning")
             return
 
-        # Pop the last history state for undo
-        history = self.histories.pop()
-
-        # Save current state for redo
-        self.history = self.create_history(history.description)
+        # Pop the last history state for undo and save to redo stack
+        history = self.histories_undo.pop()
+        self.histories_redo.append(self.create_history(history.description))
 
         # Restore state
         self.apply_history(history)
 
-        self.notify(f"Reverted: [$success]{history.description}[/]", title="Undo")
+        self.notify(f"Reverted: {history.description}", title="Undo")
 
     def do_redo(self) -> None:
         """Redo the last undone action."""
-        if self.history is None:
+        if not self.histories_redo:
             self.notify("No actions to redo", title="Redo", severity="warning")
             return
 
-        description = self.history.description
+        # Pop the last undone state from redo stack
+        history = self.histories_redo.pop()
+        description = history.description
 
         # Save current state for undo
-        self.add_history(description)
+        self.add_history(description, clear_redo=False)
 
         # Restore state
-        self.apply_history(self.history)
-
-        # Clear redo state
-        self.history = None
+        self.apply_history(history)
 
-        self.notify(f"Reapplied: [$success]{description}[/]", title="Redo")
+        self.notify(f"Reapplied: {description}", title="Redo")
 
     def do_reset(self) -> None:
         """Reset the table to the initial state."""
-        self.setup_table(reset=True)
+        self.reset_df(self.dataframe, dirty=False)
+        self.setup_table()
         self.notify("Restored initial state", title="Reset")
 
-    def restore_dirty(self, default: bool | None = None) -> None:
-        """Restore the dirty state from the last history entry."""
-        if self.last_history:
-            self.dirty = self.last_history.dirty
-        elif default is not None:
-            self.dirty = default
-
     # Display
     def do_cycle_cursor_type(self) -> None:
         """Cycle through cursor types: cell -> row -> column -> cell."""
@@ -1354,6 +1644,14 @@ class DataFrameTable(DataTable):
             cidx = self.cursor_col_idx
             self.app.push_screen(StatisticsScreen(self, col_idx=cidx))
 
+    def do_metadata_shape(self) -> None:
+        """Show metadata about the dataframe (row and column counts)."""
+        self.app.push_screen(MetaShape(self))
+
+    def do_metadata_column(self) -> None:
+        """Show metadata for all columns in the dataframe."""
+        self.app.push_screen(MetaColumnScreen(self))
+
     def do_freeze_row_column(self) -> None:
         """Open the freeze screen to set fixed rows and columns."""
         self.app.push_screen(FreezeScreen(), callback=self.freeze_row_column)
@@ -1416,14 +1714,20 @@ class DataFrameTable(DataTable):
         max_width = len(col_name) + 2  # Start with column name width + padding
 
         try:
+            need_expand = False
+
             # Scan through all loaded rows that are visible to find max width
             for row_idx in range(self.loaded_rows):
-                if not self.visible_rows[row_idx]:
-                    continue  # Skip hidden rows
                 cell_value = str(self.df.item(row_idx, col_idx))
                 cell_width = measure(self.app.console, cell_value, 1)
+
+                if cell_width > max_width:
+                    need_expand = True
                 max_width = max(max_width, cell_width)
 
+            if not need_expand:
+                return
+
             # Update the column width
             col = self.columns[col_key]
             col.width = max_width
@@ -1440,32 +1744,34 @@ class DataFrameTable(DataTable):
             )
             self.log(f"Error expanding column `{col_name}`: {str(e)}")
 
-    def do_show_hidden_rows_columns(self) -> None:
-        """Show all hidden rows/columns by recreating the table."""
-        # Get currently visible columns
-        visible_cols = set(col.key for col in self.ordered_columns)
+    def do_toggle_rid(self) -> None:
+        """Toggle display of the internal RID column."""
+        self.show_rid = not self.show_rid
 
-        hidden_row_count = sum(0 if visible else 1 for visible in self.visible_rows)
-        hidden_col_count = sum(0 if col in visible_cols else 1 for col in self.df.columns)
+        # Recreate table for display
+        self.setup_table()
 
-        if not hidden_row_count and not hidden_col_count:
-            self.notify("No hidden columns or rows to show", title="Show", severity="warning")
+    def do_show_hidden_rows_columns(self) -> None:
+        """Show all hidden rows/columns by recreating the table."""
+        if not self.hidden_columns and self.df_view is None:
+            self.notify("No hidden rows or columns to show", title="Show", severity="warning")
             return
 
         # Add to history
         self.add_history("Showed hidden rows/columns")
 
+        # If in a filtered view, restore the full dataframe
+        if self.df_view is not None:
+            self.df = self.df_view
+            self.df_view = None
+
         # Clear hidden rows/columns tracking
-        self.visible_rows = [True] * len(self.df)
         self.hidden_columns.clear()
 
         # Recreate table for display
         self.setup_table()
 
-        self.notify(
-            f"Showed [$success]{hidden_row_count}[/] hidden row(s) and/or [$accent]{hidden_col_count}[/] column(s)",
-            title="Show",
-        )
+        self.notify("Showed hidden row(s) and/or hidden column(s)", title="Show")
 
     # Sort
     def do_sort_by_column(self, descending: bool = False) -> None:
@@ -1486,32 +1792,40 @@ class DataFrameTable(DataTable):
 
         # Add to history
         self.add_history(f"Sorted on column [$success]{col_name}[/]", dirty=True)
+
+        # New column - add to sort
         if old_desc is None:
-            # Add new column to sort
             self.sorted_columns[col_name] = descending
+
+        # Old column, same direction - remove from sort
         elif old_desc == descending:
-            # Same direction - remove from sort
             del self.sorted_columns[col_name]
+
+        # Old column, different direction - add to sort at end
         else:
-            # Move to end of sort order
             del self.sorted_columns[col_name]
             self.sorted_columns[col_name] = descending
 
+        lf = self.df.lazy()
+        sort_by = {}
+
         # Apply multi-column sort
         if sort_cols := list(self.sorted_columns.keys()):
             descending_flags = list(self.sorted_columns.values())
-            df_sorted = self.df.with_row_index(RIDX).sort(sort_cols, descending=descending_flags, nulls_last=True)
+            sort_by = {"by": sort_cols, "descending": descending_flags, "nulls_last": True}
         else:
-            # No sort columns - restore original order
-            df_sorted = self.df.with_row_index(RIDX)
+            # No sort - restore original order by adding a temporary index column
+            sort_by = {"by": RID}
 
-        # Updated selected_rows and visible_rows to match new order
-        old_row_indices = df_sorted[RIDX].to_list()
-        self.selected_rows = [self.selected_rows[i] for i in old_row_indices]
-        self.visible_rows = [self.visible_rows[i] for i in old_row_indices]
+        # Perform the sort
+        df_sorted = lf.sort(**sort_by).collect()
+
+        # Also update df_view if applicable
+        if self.df_view is not None:
+            self.df_view = self.df_view.lazy().sort(**sort_by).collect()
 
         # Update the dataframe
-        self.df = df_sorted.drop(RIDX)
+        self.df = df_sorted
 
         # Recreate table for display
         self.setup_table()
@@ -1558,6 +1872,17 @@ class DataFrameTable(DataTable):
                 .alias(col_name)
             )
 
+            # Also update the view if applicable
+            if self.df_view is not None:
+                # Get the RID value for this row in df_view
+                ridx_view = self.df.item(ridx, self.df.columns.index(RID))
+                self.df_view = self.df_view.with_columns(
+                    pl.when(pl.col(RID) == ridx_view)
+                    .then(pl.lit(new_value))
+                    .otherwise(pl.col(col_name))
+                    .alias(col_name)
+                )
+
             # Update the display
             cell_value = self.df.item(ridx, cidx)
             if cell_value is None:
@@ -1633,11 +1958,26 @@ class DataFrameTable(DataTable):
 
         try:
             # Apply the expression to the column
-            self.df = self.df.with_columns(expr.alias(col_name))
+            self.df = self.df.lazy().with_columns(expr.alias(col_name)).collect()
+
+            # Also update the view if applicable
+            # Update the value of col_name in df_view using the value of col_name from df based on RID mapping between them
+            if self.df_view is not None:
+                # Get updated column from df for rows that exist in df_view
+                col_updated = f"^_{col_name}_^"
+                lf_updated = self.df.lazy().select(RID, pl.col(col_name).alias(col_updated))
+                # Join and use coalesce to prefer updated value or keep original
+                self.df_view = (
+                    self.df_view.lazy()
+                    .join(lf_updated, on=RID, how="left")
+                    .with_columns(pl.coalesce(pl.col(col_updated), pl.col(col_name)).alias(col_name))
+                    .drop(col_updated)
+                    .collect()
+                )
         except Exception as e:
             self.notify(
                 f"Error applying expression: [$error]{term}[/] to column [$accent]{col_name}[/]",
-                title="Edit",
+                title="Edit Column",
                 severity="error",
                 timeout=10,
             )
@@ -1649,10 +1989,10 @@ class DataFrameTable(DataTable):
 
         # self.notify(f"Column [$accent]{col_name}[/] updated with [$success]{expr}[/]", title="Edit Column")
 
-    def do_rename_column(self) -> None:
+    def do_rename_column(self, col_idx: int | None) -> None:
         """Open modal to rename the selected column."""
-        col_name = self.cursor_col_name
-        col_idx = self.cursor_column
+        col_idx = self.cursor_column if col_idx is None else col_idx
+        col_name = self.get_col_key(col_idx).value
 
         # Push the rename column modal screen
         self.app.push_screen(
@@ -1679,14 +2019,25 @@ class DataFrameTable(DataTable):
         # Rename the column in the dataframe
         self.df = self.df.rename({col_name: new_name})
 
-        # Update sorted_columns if this column was sorted
+        # Also update the view if applicable
+        if self.df_view is not None:
+            self.df_view = self.df_view.rename({col_name: new_name})
+
+        # Update sorted_columns if this column was sorted and maintain order
         if col_name in self.sorted_columns:
-            self.sorted_columns[new_name] = self.sorted_columns.pop(col_name)
+            sorted_columns = {}
+            for col, order in self.sorted_columns.items():
+                if col == col_name:
+                    sorted_columns[new_name] = order
+                else:
+                    sorted_columns[col] = order
+            self.sorted_columns = sorted_columns
 
-        # Update hidden_columns if this column was hidden
-        if col_name in self.hidden_columns:
-            self.hidden_columns.remove(col_name)
-            self.hidden_columns.add(new_name)
+        # Update matches if this column had cell matches
+        for cols in self.matches.values():
+            if col_name in cols:
+                cols.remove(col_name)
+                cols.add(new_name)
 
         # Recreate table for display
         self.setup_table()
@@ -1715,6 +2066,13 @@ class DataFrameTable(DataTable):
                 .alias(col_name)
             )
 
+            # Also update the view if applicable
+            if self.df_view is not None:
+                ridx_view = self.df.item(ridx, self.df.columns.index(RID))
+                self.df_view = self.df_view.with_columns(
+                    pl.when(pl.col(RID) == ridx_view).then(pl.lit(None)).otherwise(pl.col(col_name)).alias(col_name)
+                )
+
             # Update the display
             dtype = self.df.dtypes[cidx]
             dc = DtypeConfig(dtype)
@@ -1733,30 +2091,27 @@ class DataFrameTable(DataTable):
             self.log(f"Error clearing cell ({ridx}, {col_name}): {str(e)}")
             raise e
 
-    def do_add_column(self, col_name: str = None, col_value: pl.Expr = None) -> None:
+    def do_add_column(self, col_name: str = None) -> None:
         """Add acolumn after the current column."""
         cidx = self.cursor_col_idx
 
         if not col_name:
             # Generate a unique column name
             base_name = "new_col"
-            new_name = base_name
+            new_col_name = base_name
             counter = 1
-            while new_name in self.df.columns:
-                new_name = f"{base_name}_{counter}"
+            while new_col_name in self.df.columns:
+                new_col_name = f"{base_name}_{counter}"
                 counter += 1
         else:
-            new_name = col_name
+            new_col_name = col_name
 
         # Add to history
-        self.add_history(f"Added column [$success]{new_name}[/] after column [$accent]{cidx + 1}[/]", dirty=True)
+        self.add_history(f"Added column [$success]{new_col_name}[/] after column [$accent]{cidx + 1}[/]", dirty=True)
 
         try:
             # Create an empty column (all None values)
-            if isinstance(col_value, pl.Expr):
-                new_col = col_value.alias(new_name)
-            else:
-                new_col = pl.lit(col_value).alias(new_name)
+            new_col_name = pl.lit(None).alias(new_col_name)
 
             # Get columns up to current, the new column, then remaining columns
             cols = self.df.columns
@@ -1764,8 +2119,12 @@ class DataFrameTable(DataTable):
             cols_after = cols[cidx + 1 :]
 
             # Build the new dataframe with columns reordered
-            select_cols = cols_before + [new_name] + cols_after
-            self.df = self.df.with_columns(new_col).select(select_cols)
+            select_cols = cols_before + [new_col_name] + cols_after
+            self.df = self.df.lazy().with_columns(new_col_name).select(select_cols).collect()
+
+            # Also update the view if applicable
+            if self.df_view is not None:
+                self.df_view = self.df_view.lazy().with_columns(new_col_name).select(select_cols).collect()
 
             # Recreate table for display
             self.setup_table()
@@ -1775,8 +2134,10 @@ class DataFrameTable(DataTable):
 
             # self.notify(f"Added column [$success]{new_name}[/]", title="Add Column")
         except Exception as e:
-            self.notify(f"Error adding column [$error]{new_name}[/]", title="Add Column", severity="error", timeout=10)
-            self.log(f"Error adding column `{new_name}`: {str(e)}")
+            self.notify(
+                f"Error adding column [$error]{new_col_name}[/]", title="Add Column", severity="error", timeout=10
+            )
+            self.log(f"Error adding column `{new_col_name}`: {str(e)}")
             raise e
 
     def do_add_column_expr(self) -> None:
@@ -1808,7 +2169,14 @@ class DataFrameTable(DataTable):
 
             # Build the new dataframe with columns reordered
             select_cols = cols_before + [new_col_name] + cols_after
-            self.df = self.df.with_row_index(RIDX).with_columns(new_col).select(select_cols)
+            self.df = self.df.lazy().with_columns(new_col).select(select_cols).collect()
+
+            # Also update the view if applicable
+            if self.df_view is not None:
+                # Get updated column from df for rows that exist in df_view
+                lf_updated = self.df.lazy().select(RID, pl.col(new_col_name))
+                # Join and use coalesce to prefer updated value or keep original
+                self.df_view = self.df_view.lazy().join(lf_updated, on=RID, how="left").select(select_cols).collect()
 
             # Recreate table for display
             self.setup_table()
@@ -1832,10 +2200,10 @@ class DataFrameTable(DataTable):
     def add_link_column(self, result: tuple[str, str] | None) -> None:
         """Handle result from AddLinkScreen.
 
-        Creates a new link column in the dataframe with clickable links based on a
-        user-provided template. Supports multiple placeholder types:
+        Creates a new link column in the dataframe based on a user-provided template.
+        Supports multiple placeholder types:
         - `$_` - Current column (based on cursor position)
-        - `$1`, `$2`, etc. - Column by 1-based position index
+        - `$1`, `$2`, etc. - Column by index (1-based)
         - `$name` - Column by name (e.g., `$id`, `$product_name`)
 
         The template is evaluated for each row using Polars expressions with vectorized
@@ -1874,7 +2242,14 @@ class DataFrameTable(DataTable):
 
             # Build the new dataframe with columns reordered
             select_cols = cols_before + [new_col_name] + cols_after
-            self.df = self.df.with_columns(new_col).select(select_cols)
+            self.df = self.df.lazy().with_columns(new_col).select(select_cols).collect()
+
+            # Also update the view if applicable
+            if self.df_view is not None:
+                # Get updated column from df for rows that exist in df_view
+                lf_updated = self.df.lazy().select(RID, pl.col(new_col_name))
+                # Join and use coalesce to prefer updated value or keep original
+                self.df_view = self.df_view.lazy().join(lf_updated, on=RID, how="left").select(select_cols).collect()
 
             # Recreate table for display
             self.setup_table()
@@ -1903,7 +2278,7 @@ class DataFrameTable(DataTable):
         # Remove all columns before the current column
         if more == "before":
             for i in range(col_idx + 1):
-                col_key = self.get_column_key(i)
+                col_key = self.get_col_key(i)
                 col_names_to_remove.append(col_key.value)
                 col_keys_to_remove.append(col_key)
 
@@ -1912,7 +2287,7 @@ class DataFrameTable(DataTable):
         # Remove all columns after the current column
         elif more == "after":
             for i in range(col_idx, len(self.columns)):
-                col_key = self.get_column_key(i)
+                col_key = self.get_col_key(i)
                 col_names_to_remove.append(col_key.value)
                 col_keys_to_remove.append(col_key)
 
@@ -1941,17 +2316,24 @@ class DataFrameTable(DataTable):
             if col_name in self.sorted_columns:
                 del self.sorted_columns[col_name]
 
+        # Remove from hidden columns if present
+        for col_name in col_names_to_remove:
+            self.hidden_columns.discard(col_name)
+
         # Remove from matches
-        col_indices_to_remove = set(self.df.columns.index(name) for name in col_names_to_remove)
-        for row_idx in list(self.matches.keys()):
-            self.matches[row_idx].difference_update(col_indices_to_remove)
+        for rid in list(self.matches.keys()):
+            self.matches[rid].difference_update(col_names_to_remove)
             # Remove empty entries
-            if not self.matches[row_idx]:
-                del self.matches[row_idx]
+            if not self.matches[rid]:
+                del self.matches[rid]
 
         # Remove from dataframe
         self.df = self.df.drop(col_names_to_remove)
 
+        # Also update the view if applicable
+        if self.df_view is not None:
+            self.df_view = self.df_view.drop(col_names_to_remove)
+
         self.notify(message, title="Delete")
 
     def do_duplicate_column(self) -> None:
@@ -1962,29 +2344,28 @@ class DataFrameTable(DataTable):
         col_idx = self.cursor_column
         new_col_name = f"{col_name}_copy"
 
+        # Ensure new column name is unique
+        counter = 1
+        while new_col_name in self.df.columns:
+            new_col_name = f"{new_col_name}{counter}"
+            counter += 1
+
         # Add to history
         self.add_history(f"Duplicated column [$success]{col_name}[/]", dirty=True)
 
         # Create new column and reorder columns to insert after current column
         cols_before = self.df.columns[: cidx + 1]
         cols_after = self.df.columns[cidx + 1 :]
+        cols_new = cols_before + [new_col_name] + cols_after
 
         # Add the new column and reorder columns for insertion after current column
-        self.df = self.df.with_columns(pl.col(col_name).alias(new_col_name)).select(
-            list(cols_before) + [new_col_name] + list(cols_after)
-        )
+        self.df = self.df.lazy().with_columns(pl.col(col_name).alias(new_col_name)).select(cols_new).collect()
 
-        # Update matches to account for new column
-        new_matches = defaultdict(set)
-        for row_idx, cols in self.matches.items():
-            new_cols = set()
-            for col_idx_in_set in cols:
-                if col_idx_in_set <= cidx:
-                    new_cols.add(col_idx_in_set)
-                else:
-                    new_cols.add(col_idx_in_set + 1)
-            new_matches[row_idx] = new_cols
-        self.matches = new_matches
+        # Also update the view if applicable
+        if self.df_view is not None:
+            self.df_view = (
+                self.df_view.lazy().with_columns(pl.col(col_name).alias(new_col_name)).select(cols_new).collect()
+            )
 
         # Recreate table for display
         self.setup_table()
@@ -2000,58 +2381,61 @@ class DataFrameTable(DataTable):
         Supports deleting multiple selected rows. If no rows are selected, deletes the row at the cursor.
         """
         old_count = len(self.df)
-        predicates = [True] * len(self.df)
+        rids_to_delete = set()
 
         # Delete all selected rows
-        if selected_count := self.selected_rows.count(True):
+        if selected_count := len(self.selected_rows):
             history_desc = f"Deleted {selected_count} selected row(s)"
-
-            for ridx, selected in enumerate(self.selected_rows):
-                if selected:
-                    predicates[ridx] = False
+            rids_to_delete = self.selected_rows
 
         # Delete current row and those above
         elif more == "above":
             ridx = self.cursor_row_idx
             history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those above"
-            for i in range(ridx + 1):
-                predicates[i] = False
+            for rid in self.df[RID][: ridx + 1]:
+                rids_to_delete.add(rid)
 
         # Delete current row and those below
         elif more == "below":
             ridx = self.cursor_row_idx
             history_desc = f"Deleted current row [$success]{ridx + 1}[/] and those below"
-            for i in range(ridx, len(self.df)):
-                if self.visible_rows[i]:
-                    predicates[i] = False
+            for rid in self.df[RID][ridx:]:
+                rids_to_delete.add(rid)
 
         # Delete the row at the cursor
         else:
             ridx = self.cursor_row_idx
             history_desc = f"Deleted row [$success]{ridx + 1}[/]"
-            if self.visible_rows[ridx]:
-                predicates[ridx] = False
+            rids_to_delete.add(self.df[RID][ridx])
 
         # Add to history
         self.add_history(history_desc, dirty=True)
 
         # Apply the filter to remove rows
         try:
-            df = self.df.with_row_index(RIDX).filter(predicates)
+            df_filtered = self.df.lazy().filter(~pl.col(RID).is_in(rids_to_delete)).collect()
         except Exception as e:
             self.notify(f"Error deleting row(s): {e}", title="Delete", severity="error", timeout=10)
-            self.histories.pop()  # Remove last history entry
+            self.histories_undo.pop()  # Remove last history entry
             return
 
-        self.df = df.drop(RIDX)
+        # RIDs of remaining rows
+        ok_rids = set(df_filtered[RID])
 
-        # Update selected and visible rows tracking
-        old_row_indices = set(df[RIDX].to_list())
-        self.selected_rows = [selected for i, selected in enumerate(self.selected_rows) if i in old_row_indices]
-        self.visible_rows = [visible for i, visible in enumerate(self.visible_rows) if i in old_row_indices]
+        # Update selected rows tracking
+        if self.selected_rows:
+            self.selected_rows.intersection_update(ok_rids)
 
-        # Clear all matches since row indices have changed
-        self.matches = defaultdict(set)
+        # Update the dataframe
+        self.df = df_filtered
+
+        # Update matches since row indices have changed
+        if self.matches:
+            self.matches = {rid: cols for rid, cols in self.matches.items() if rid in ok_rids}
+
+        # Also update the view if applicable
+        if self.df_view is not None:
+            self.df_view = self.df_view.lazy().filter(~pl.col(RID).is_in(rids_to_delete)).collect()
 
         # Recreate table for display
         self.setup_table()
@@ -2063,34 +2447,29 @@ class DataFrameTable(DataTable):
     def do_duplicate_row(self) -> None:
         """Duplicate the currently selected row, inserting it right after the current row."""
         ridx = self.cursor_row_idx
+        rid = self.df[RID][ridx]
+
+        lf = self.df.lazy()
 
         # Get the row to duplicate
-        row_to_duplicate = self.df.slice(ridx, 1)
+        row_to_duplicate = lf.slice(ridx, 1).with_columns(pl.col(RID) + 1)
 
         # Add to history
         self.add_history(f"Duplicated row [$success]{ridx + 1}[/]", dirty=True)
 
         # Concatenate: rows before + duplicated row + rows after
-        df_before = self.df.slice(0, ridx + 1)
-        df_after = self.df.slice(ridx + 1)
+        lf_before = lf.slice(0, ridx + 1)
+        lf_after = lf.slice(ridx + 1).with_columns(pl.col(RID) + 1)
 
         # Combine the parts
-        self.df = pl.concat([df_before, row_to_duplicate, df_after])
-
-        # Update selected and visible rows tracking to account for new row
-        new_selected_rows = self.selected_rows[: ridx + 1] + [self.selected_rows[ridx]] + self.selected_rows[ridx + 1 :]
-        new_visible_rows = self.visible_rows[: ridx + 1] + [self.visible_rows[ridx]] + self.visible_rows[ridx + 1 :]
-        self.selected_rows = new_selected_rows
-        self.visible_rows = new_visible_rows
-
-        # Update matches to account for new row
-        new_matches = defaultdict(set)
-        for row_idx, cols in self.matches.items():
-            if row_idx <= ridx:
-                new_matches[row_idx] = cols
-            else:
-                new_matches[row_idx + 1] = cols
-        self.matches = new_matches
+        self.df = pl.concat([lf_before, row_to_duplicate, lf_after]).collect()
+
+        # Also update the view if applicable
+        if self.df_view is not None:
+            lf_view = self.df_view.lazy()
+            lf_view_before = lf_view.slice(0, rid + 1)
+            lf_view_after = lf_view.slice(rid + 1).with_columns(pl.col(RID) + 1)
+            self.df_view = pl.concat([lf_view_before, row_to_duplicate, lf_view_after]).collect()
 
         # Recreate table for display
         self.setup_table()
@@ -2156,6 +2535,10 @@ class DataFrameTable(DataTable):
         cols[cidx], cols[swap_cidx] = cols[swap_cidx], cols[cidx]
         self.df = self.df.select(cols)
 
+        # Also update the view if applicable
+        if self.df_view is not None:
+            self.df_view = self.df_view.select(cols)
+
         # self.notify(f"Moved column [$success]{col_name}[/] {direction}", title="Move")
 
     def do_move_row(self, direction: str) -> None:
@@ -2164,65 +2547,88 @@ class DataFrameTable(DataTable):
         Args:
             direction: "up" to move up, "down" to move down.
         """
-        row_idx, col_idx = self.cursor_coordinate
+        curr_row_idx, col_idx = self.cursor_coordinate
 
         # Validate move is possible
         if direction == "up":
-            if row_idx <= 0:
+            if curr_row_idx <= 0:
                 self.notify("Cannot move row up", title="Move", severity="warning")
                 return
-            swap_idx = row_idx - 1
+            swap_row_idx = curr_row_idx - 1
         elif direction == "down":
-            if row_idx >= len(self.rows) - 1:
+            if curr_row_idx >= len(self.rows) - 1:
                 self.notify("Cannot move row down", title="Move", severity="warning")
                 return
-            swap_idx = row_idx + 1
+            swap_row_idx = curr_row_idx + 1
         else:
             # Invalid direction
             return
 
-        row_key = self.coordinate_to_cell_key((row_idx, 0)).row_key
-        swap_key = self.coordinate_to_cell_key((swap_idx, 0)).row_key
-
         # Add to history
         self.add_history(
-            f"Moved row [$success]{row_key.value}[/] [$accent]{direction}[/] (swapped with row [$success]{swap_key.value}[/])",
+            f"Moved row [$success]{curr_row_idx}[/] [$accent]{direction}[/] (swapped with row [$success]{swap_row_idx}[/])",
             dirty=True,
         )
 
         # Swap rows in the table's internal row locations
+        curr_key = self.coordinate_to_cell_key((curr_row_idx, 0)).row_key
+        swap_key = self.coordinate_to_cell_key((swap_row_idx, 0)).row_key
+
         self.check_idle()
 
         (
-            self._row_locations[row_key],
+            self._row_locations[curr_key],
             self._row_locations[swap_key],
         ) = (
-            self._row_locations.get(swap_key),
-            self._row_locations.get(row_key),
+            self.get_row_idx(swap_key),
+            self.get_row_idx(curr_key),
         )
 
         self._update_count += 1
         self.refresh()
 
         # Restore cursor position on the moved row
-        self.move_cursor(row=swap_idx, column=col_idx)
+        self.move_cursor(row=swap_row_idx, column=col_idx)
 
-        # Swap rows in the dataframe
-        ridx = int(row_key.value)  # 0-based
-        swap_ridx = int(swap_key.value)  # 0-based
-        first, second = sorted([ridx, swap_ridx])
+        # Locate the rows to swap
+        curr_ridx = curr_row_idx
+        swap_ridx = swap_row_idx
+        first, second = sorted([curr_ridx, swap_ridx])
 
+        # Swap the rows in the dataframe
         self.df = pl.concat(
             [
-                self.df.slice(0, first),
-                self.df.slice(second, 1),
-                self.df.slice(first + 1, second - first - 1),
-                self.df.slice(first, 1),
-                self.df.slice(second + 1),
+                self.df.slice(0, first).lazy(),
+                self.df.slice(second, 1).lazy(),
+                self.df.slice(first + 1, second - first - 1).lazy(),
+                self.df.slice(first, 1).lazy(),
+                self.df.slice(second + 1).lazy(),
             ]
-        )
+        ).collect()
 
-        # self.notify(f"Moved row [$success]{row_key.value}[/] {direction}", title="Move")
+        # Also update the view if applicable
+        if self.df_view is not None:
+            # Find RID values
+            curr_rid = self.df[RID][curr_row_idx]
+            swap_rid = self.df[RID][swap_row_idx]
+
+            # Locate the rows by RID in the view
+            curr_ridx = self.df_view[RID].index_of(curr_rid)
+            swap_ridx = self.df_view[RID].index_of(swap_rid)
+            first, second = sorted([curr_ridx, swap_ridx])
+
+            # Swap the rows in the view
+            self.df_view = pl.concat(
+                [
+                    self.df_view.slice(0, first).lazy(),
+                    self.df_view.slice(second, 1).lazy(),
+                    self.df_view.slice(first + 1, second - first - 1).lazy(),
+                    self.df_view.slice(first, 1).lazy(),
+                    self.df_view.slice(second + 1).lazy(),
+                ]
+            ).collect()
+
+        # self.notify(f"Moved row [$success]{row_key.value}[/] {direction}", title="Move Row")
 
     # Type casting
     def do_cast_column_dtype(self, dtype: str) -> None:
@@ -2259,6 +2665,10 @@ class DataFrameTable(DataTable):
             # Cast the column using Polars
             self.df = self.df.with_columns(pl.col(col_name).cast(target_dtype))
 
+            # Also update the view if applicable
+            if self.df_view is not None:
+                self.df_view = self.df_view.with_columns(pl.col(col_name).cast(target_dtype))
+
             # Recreate table for display
             self.setup_table()
 
@@ -2272,18 +2682,32 @@ class DataFrameTable(DataTable):
             )
             self.log(f"Error casting column `{col_name}`: {str(e)}")
 
-    # Search
-    def do_search_cursor_value(self) -> None:
-        """Search with cursor value in current column."""
+    # Row selection
+    def do_select_row(self) -> None:
+        """Select rows.
+
+        If there are existing cell matches, use those to select rows.
+        Otherwise, use the current cell value as the search term and select rows matching that value.
+        """
         cidx = self.cursor_col_idx
 
-        # Get the value of the currently selected cell
-        term = NULL if self.cursor_value is None else str(self.cursor_value)
+        # Use existing cell matches if present
+        if self.matches:
+            term = pl.col(RID).is_in(self.matches)
+        else:
+            col_name = self.cursor_col_name
 
-        self.search((term, cidx, False, True))
+            # Get the value of the currently selected cell
+            term = NULL if self.cursor_value is None else str(self.cursor_value)
+            if self.cursor_value is None:
+                term = pl.col(col_name).is_null()
+            else:
+                term = pl.col(col_name) == self.cursor_value
+
+        self.select_row((term, cidx, False, True))
 
-    def do_search_expr(self) -> None:
-        """Search by expression."""
+    def do_select_row_expr(self) -> None:
+        """Select rows by expression."""
         cidx = self.cursor_col_idx
 
         # Use current cell value as default search term
@@ -2291,22 +2715,31 @@ class DataFrameTable(DataTable):
 
         # Push the search modal screen
         self.app.push_screen(
-            SearchScreen("Search", term, self.df, cidx),
-            callback=self.search,
+            SearchScreen("Select", term, self.df, cidx),
+            callback=self.select_row,
         )
 
-    def search(self, result) -> None:
-        """Search for a term."""
+    def select_row(self, result) -> None:
+        """Select rows by value or expression."""
         if result is None:
             return
 
         term, cidx, match_nocase, match_whole = result
-        col_name = self.df.columns[cidx]
+        col_name = "all columns" if cidx is None else self.df.columns[cidx]
 
-        if term == NULL:
+        # Already a Polars expression
+        if isinstance(term, pl.Expr):
+            expr = term
+
+        # bool list or Series
+        elif isinstance(term, (list, pl.Series)):
+            expr = term
+
+        # Null case
+        elif term == NULL:
             expr = pl.col(col_name).is_null()
 
-        # Support for polars expressions
+        # Expression in string form
         elif tentative_expr(term):
             try:
                 expr = validate_expr(term, self.df.columns, cidx)
@@ -2343,49 +2776,121 @@ class DataFrameTable(DataTable):
                     )
 
         # Lazyframe for filtering
-        lf = self.df.lazy().with_row_index(RIDX)
-        if self.has_hidden_rows:
-            lf = lf.filter(self.visible_rows)
+        lf = self.df.lazy()
 
         # Apply filter to get matched row indices
         try:
-            matches = set(lf.filter(expr).select(RIDX).collect().to_series().to_list())
+            ok_rids = set(lf.filter(expr).collect()[RID])
         except Exception as e:
-            self.notify(f"Error applying search filter [$error]{term}[/]", title="Search", severity="error", timeout=10)
+            self.notify(
+                f"Error applying search filter `[$error]{term}[/]`", title="Search", severity="error", timeout=10
+            )
             self.log(f"Error applying search filter `{term}`: {str(e)}")
             return
 
-        match_count = len(matches)
+        match_count = len(ok_rids)
         if match_count == 0:
             self.notify(
-                f"No matches found for [$warning]{term}[/]. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for `[$warning]{term}[/]`. Try [$accent](?i)abc[/] for case-insensitive search.",
                 title="Search",
                 severity="warning",
             )
             return
 
+        message = f"Found [$success]{match_count}[/] matching row(s)"
+
         # Add to history
-        self.add_history(f"Searched [$success]{term}[/] in column [$accent]{col_name}[/]")
+        self.add_history(message)
 
-        # Update selected rows to include new matches
-        for m in matches:
-            self.selected_rows[m] = True
+        # Update selected rows to include new selections
+        self.selected_rows.update(ok_rids)
 
         # Show notification immediately, then start highlighting
-        self.notify(f"Found [$success]{match_count}[/] matches for [$accent]{term}[/]", title="Search")
+        self.notify(message, title="Select Row")
 
         # Recreate table for display
         self.setup_table()
 
-    # Find
+    def do_toggle_selections(self) -> None:
+        """Toggle selected rows highlighting on/off."""
+        # Add to history
+        self.add_history("Toggled row selection")
+
+        # Invert all selected rows
+        self.selected_rows = {rid for rid in self.df[RID] if rid not in self.selected_rows}
+
+        # Check if we're highlighting or un-highlighting
+        if selected_count := len(self.selected_rows):
+            self.notify(f"Toggled selection for [$success]{selected_count}[/] rows", title="Toggle")
+
+        # Recreate table for display
+        self.setup_table()
+
+    def do_toggle_row_selection(self) -> None:
+        """Select/deselect current row."""
+        # Add to history
+        self.add_history("Toggled row selection")
+
+        # Get current row RID
+        ridx = self.cursor_row_idx
+        rid = self.df[RID][ridx]
+
+        if rid in self.selected_rows:
+            self.selected_rows.discard(rid)
+        else:
+            self.selected_rows.add(rid)
+
+        row_key = self.cursor_row_key
+        is_selected = rid in self.selected_rows
+        match_cols = self.matches.get(rid, set())
+
+        for col_idx, col in enumerate(self.ordered_columns):
+            col_key = col.key
+            col_name = col_key.value
+            cell_text: Text = self.get_cell(row_key, col_key)
+
+            if is_selected or (col_name in match_cols):
+                cell_text.style = HIGHLIGHT_COLOR
+            else:
+                # Reset to default style based on dtype
+                dtype = self.df.dtypes[col_idx]
+                dc = DtypeConfig(dtype)
+                cell_text.style = dc.style
+
+            self.update_cell(row_key, col_key, cell_text)
+
+    def do_clear_selections_and_matches(self) -> None:
+        """Clear all selected rows and matches without removing them from the dataframe."""
+        # Check if any selected rows or matches
+        if not self.selected_rows and not self.matches:
+            self.notify("No selections to clear", title="Clear", severity="warning")
+            return
+
+        row_count = len(self.selected_rows | set(self.matches.keys()))
+
+        # Add to history
+        self.add_history("Cleared all selected rows")
+
+        # Clear all selections
+        self.selected_rows = set()
+        self.matches = defaultdict(set)
+
+        # Recreate table for display
+        self.setup_table()
+
+        self.notify(f"Cleared selections for [$success]{row_count}[/] rows", title="Clear")
+
+    # Find & Replace
     def find_matches(
         self, term: str, cidx: int | None = None, match_nocase: bool = False, match_whole: bool = False
-    ) -> dict[int, set[int]]:
+    ) -> dict[int, set[str]]:
         """Find matches for a term in the dataframe.
 
         Args:
             term: The search term (can be NULL, expression, or plain text)
             cidx: Column index for column-specific search. If None, searches all columns.
+            match_nocase: Whether to perform case-insensitive matching (for string terms)
+            match_whole: Whether to match the whole cell content (for string terms)
 
         Returns:
             Dictionary mapping row indices to sets of column indices containing matches.
@@ -2395,12 +2900,10 @@ class DataFrameTable(DataTable):
         Raises:
             Exception: If expression validation or filtering fails.
         """
-        matches: dict[int, set[int]] = defaultdict(set)
+        matches: dict[int, set[str]] = defaultdict(set)
 
         # Lazyframe for filtering
-        lf = self.df.lazy().with_row_index(RIDX)
-        if self.has_hidden_rows:
-            lf = lf.filter(self.visible_rows)
+        lf = self.df.lazy()
 
         # Determine which columns to search: single column or all columns
         if cidx is not None:
@@ -2431,14 +2934,14 @@ class DataFrameTable(DataTable):
 
             # Get matched row indices
             try:
-                matched_ridxs = lf.filter(expr).select(RIDX).collect().to_series().to_list()
+                matched_ridxs = lf.filter(expr).collect()[RID]
             except Exception as e:
                 self.notify(f"Error applying filter: [$error]{expr}[/]", title="Find", severity="error", timeout=10)
                 self.log(f"Error applying filter: {str(e)}")
                 return matches
 
             for ridx in matched_ridxs:
-                matches[ridx].add(col_idx)
+                matches[ridx].add(col_name)
 
         return matches
 
@@ -2484,27 +2987,27 @@ class DataFrameTable(DataTable):
         try:
             matches = self.find_matches(term, cidx, match_nocase, match_whole)
         except Exception as e:
-            self.notify(f"Error finding matches for [$error]{term}[/]", title="Find", severity="error", timeout=10)
+            self.notify(f"Error finding matches for `[$error]{term}[/]`", title="Find", severity="error", timeout=10)
             self.log(f"Error finding matches for `{term}`: {str(e)}")
             return
 
         if not matches:
             self.notify(
-                f"No matches found for [$warning]{term}[/] in current column. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for `[$warning]{term}[/]` in current column. Try [$accent](?i)abc[/] for case-insensitive search.",
                 title="Find",
                 severity="warning",
             )
             return
 
         # Add to history
-        self.add_history(f"Found [$success]{term}[/] in column [$accent]{col_name}[/]")
+        self.add_history(f"Found `[$success]{term}[/]` in column [$accent]{col_name}[/]")
 
         # Add to matches and count total
-        match_count = sum(len(col_idxs) for col_idxs in matches.values())
-        for ridx, col_idxs in matches.items():
-            self.matches[ridx].update(col_idxs)
+        match_count = sum(len(cols) for cols in matches.values())
+        for rid, cols in matches.items():
+            self.matches[rid].update(cols)
 
-        self.notify(f"Found [$success]{match_count}[/] matches for [$accent]{term}[/]", title="Find")
+        self.notify(f"Found [$success]{match_count}[/] matches for `[$accent]{term}[/]`", title="Find")
 
         # Recreate table for display
         self.setup_table()
@@ -2518,28 +3021,29 @@ class DataFrameTable(DataTable):
         try:
             matches = self.find_matches(term, cidx=None, match_nocase=match_nocase, match_whole=match_whole)
         except Exception as e:
-            self.notify(f"Error finding matches for [$error]{term}[/]", title="Find", severity="error", timeout=10)
+            self.notify(f"Error finding matches for `[$error]{term}[/]`", title="Find", severity="error", timeout=10)
             self.log(f"Error finding matches for `{term}`: {str(e)}")
             return
 
         if not matches:
             self.notify(
-                f"No matches found for [$warning]{term}[/] in any column. Try [$accent](?i)abc[/] for case-insensitive search.",
+                f"No matches found for `[$warning]{term}[/]` in any column. Try [$accent](?i)abc[/] for case-insensitive search.",
                 title="Global Find",
                 severity="warning",
             )
             return
 
         # Add to history
-        self.add_history(f"Found [$success]{term}[/] across all columns")
+        self.add_history(f"Found `[$success]{term}[/]` across all columns")
 
         # Add to matches and count total
-        match_count = sum(len(col_idxs) for col_idxs in matches.values())
-        for ridx, col_idxs in matches.items():
-            self.matches[ridx].update(col_idxs)
+        match_count = sum(len(cols) for cols in matches.values())
+        for rid, cols in matches.items():
+            self.matches[rid].update(cols)
 
         self.notify(
-            f"Found [$success]{match_count}[/] matches for [$accent]{term}[/] across all columns", title="Global Find"
+            f"Found [$success]{match_count}[/] matches for `[$accent]{term}[/]` across all columns",
+            title="Global Find",
         )
 
         # Recreate table for display
@@ -2597,7 +3101,7 @@ class DataFrameTable(DataTable):
 
     def do_next_selected_row(self) -> None:
         """Move cursor to the next selected row."""
-        if not any(self.selected_rows):
+        if not self.selected_rows:
             self.notify("No selected rows to navigate", title="Next Selected Row", severity="warning")
             return
 
@@ -2619,7 +3123,7 @@ class DataFrameTable(DataTable):
 
     def do_previous_selected_row(self) -> None:
         """Move cursor to the previous selected row."""
-        if not any(self.selected_rows):
+        if not self.selected_rows:
             self.notify("No selected rows to navigate", title="Previous Selected Row", severity="warning")
             return
 
@@ -2639,7 +3143,6 @@ class DataFrameTable(DataTable):
         last_ridx = selected_row_indices[-1]
         self.move_cursor_to(last_ridx, self.cursor_col_idx)
 
-    # Replace
     def do_replace(self) -> None:
         """Open replace screen for current column."""
         # Push the replace modal screen
@@ -2693,25 +3196,34 @@ class DataFrameTable(DataTable):
         )
 
         # Update matches
-        self.matches = {ridx: col_idxs.copy() for ridx, col_idxs in matches.items()}
+        self.matches = matches
 
         # Recreate table for display
         self.setup_table()
 
         # Store state for interactive replacement using dataclass
-        sorted_rows = sorted(self.matches.keys())
+        rid2ridx = {rid: ridx for ridx, rid in enumerate(self.df[RID]) if rid in self.matches}
+
+        # Unique columns to replace
+        cols_to_replace = set()
+        for cols in self.matches.values():
+            cols_to_replace.update(cols)
+
+        # Sorted column indices to replace
+        cidx2col = {cidx: col for cidx, col in enumerate(self.df.columns) if col in cols_to_replace}
+
         self.replace_state = ReplaceState(
             term_find=term_find,
             term_replace=term_replace,
             match_nocase=match_nocase,
             match_whole=match_whole,
             cidx=cidx,
-            rows=sorted_rows,
-            cols_per_row=[sorted(self.matches[ridx]) for ridx in sorted_rows],
+            rows=list(rid2ridx.values()),
+            cols_per_row=[[cidx for cidx, col in cidx2col.items() if col in self.matches[rid]] for rid in rid2ridx],
             current_rpos=0,
             current_cpos=0,
             current_occurrence=0,
-            total_occurrence=sum(len(col_idxs) for col_idxs in self.matches.values()),
+            total_occurrence=sum(len(cols) for cols in self.matches.values()),
             replaced_occurrence=0,
             skipped_occurrence=0,
             done=False,
@@ -2740,7 +3252,7 @@ class DataFrameTable(DataTable):
         self.app.push_screen(
             ConfirmScreen(
                 "Replace All",
-                label=f"Replace [$success]{term_find}[/] with [$success]{term_replace or repr('')}[/] for all [$accent]{state.total_occurrence}[/] occurrences?",
+                label=f"Replace `[$success]{term_find}[/]` with `[$success]{term_replace}[/]` for all [$accent]{state.total_occurrence}[/] occurrences?",
             ),
             callback=self.handle_replace_all_confirmation,
         )
@@ -2795,6 +3307,18 @@ class DataFrameTable(DataTable):
                     pl.when(mask).then(pl.lit(value)).otherwise(pl.col(col_name)).alias(col_name)
                 )
 
+            # Also update the view if applicable
+            if self.df_view is not None:
+                col_updated = f"^_{col_name}_^"
+                lf_updated = self.df.lazy().filter(mask).select(pl.col(col_name).alias(col_updated), pl.col(RID))
+                self.df_view = (
+                    self.df_view.lazy()
+                    .join(lf_updated, on=RID, how="left")
+                    .with_columns(pl.coalesce(pl.col(col_updated), pl.col(col_name)).alias(col_name))
+                    .drop(col_updated)
+                    .collect()
+                )
+
             state.replaced_occurrence += len(ridxs)
 
         # Recreate table for display
@@ -2806,7 +3330,7 @@ class DataFrameTable(DataTable):
 
         col_name = "all columns" if state.cidx is None else self.df.columns[state.cidx]
         self.notify(
-            f"Replaced [$success]{state.replaced_occurrence}[/] of [$accent]{state.total_occurrence}[/] in [$s]{col_name}[/]",
+            f"Replaced [$success]{state.replaced_occurrence}[/] of [$success]{state.total_occurrence}[/] in [$accent]{col_name}[/]",
             title="Replace",
         )
 
@@ -2830,7 +3354,7 @@ class DataFrameTable(DataTable):
         if state.done:
             # All done - show final notification
             col_name = "all columns" if state.cidx is None else self.df.columns[state.cidx]
-            msg = f"Replaced [$success]{state.replaced_occurrence}[/] of [$accent]{state.total_occurrence}[/] in [$success]{col_name}[/]"
+            msg = f"Replaced [$success]{state.replaced_occurrence}[/] of [$success]{state.total_occurrence}[/] in [$accent]{col_name}[/]"
             if state.skipped_occurrence > 0:
                 msg += f", [$warning]{state.skipped_occurrence}[/] skipped"
             self.notify(msg, title="Replace")
@@ -2848,7 +3372,7 @@ class DataFrameTable(DataTable):
         state.current_occurrence += 1
 
         # Show confirmation
-        label = f"Replace [$warning]{state.term_find}[/] with [$success]{state.term_replace}[/] ({state.current_occurrence} of {state.total_occurrence})?"
+        label = f"Replace `[$warning]{state.term_find}[/]` with `[$success]{state.term_replace}[/]` ({state.current_occurrence} of {state.total_occurrence})?"
 
         self.app.push_screen(
             ConfirmScreen("Replace", label=label, maybe="Skip"),
@@ -2865,6 +3389,7 @@ class DataFrameTable(DataTable):
         cidx = state.cols_per_row[state.current_rpos][state.current_cpos]
         col_name = self.df.columns[cidx]
         dtype = self.df.dtypes[cidx]
+        rid = self.df[RID][ridx]
 
         # Replace
         if result is True:
@@ -2877,6 +3402,15 @@ class DataFrameTable(DataTable):
                     .otherwise(pl.col(col_name))
                     .alias(col_name)
                 )
+
+                # Also update the view if applicable
+                if self.df_view is not None:
+                    self.df_view = self.df_view.with_columns(
+                        pl.when(pl.col(RID) == rid)
+                        .then(pl.col(col_name).str.replace_all(term_find, state.term_replace))
+                        .otherwise(pl.col(col_name))
+                        .alias(col_name)
+                    )
             else:
                 # try to convert replacement value to column dtype
                 try:
@@ -2891,6 +3425,12 @@ class DataFrameTable(DataTable):
                     .alias(col_name)
                 )
 
+                # Also update the view if applicable
+                if self.df_view is not None:
+                    self.df_view = self.df_view.with_columns(
+                        pl.when(pl.col(RID) == rid).then(pl.lit(value)).otherwise(pl.col(col_name)).alias(col_name)
+                    )
+
             state.replaced_occurrence += 1
 
         # Skip
@@ -2923,127 +3463,20 @@ class DataFrameTable(DataTable):
         # Show next confirmation
         self.show_next_replace_confirmation()
 
-    # Selection & Match
-    def do_toggle_selections(self) -> None:
-        """Toggle selected rows highlighting on/off."""
-        # Add to history
-        self.add_history("Toggled row selection")
-
-        if self.has_hidden_rows:
-            # Some rows are hidden - invert only selected visible rows and clear selections for hidden rows
-            for i in range(len(self.selected_rows)):
-                if self.visible_rows[i]:
-                    self.selected_rows[i] = not self.selected_rows[i]
-                else:
-                    self.selected_rows[i] = False
-        else:
-            # Invert all selected rows
-            self.selected_rows = [not selected for selected in self.selected_rows]
-
-        # Check if we're highlighting or un-highlighting
-        if new_selected_count := self.selected_rows.count(True):
-            self.notify(f"Toggled selection for [$success]{new_selected_count}[/] rows", title="Toggle")
-
-        # Recreate table for display
-        self.setup_table()
-
-    def do_toggle_row_selection(self) -> None:
-        """Select/deselect current row."""
-        # Add to history
-        self.add_history("Toggled row selection")
-
-        ridx = self.cursor_row_idx
-        self.selected_rows[ridx] = not self.selected_rows[ridx]
-
-        row_key = str(ridx)
-        match_cols = self.matches.get(ridx, set())
-        for col_idx, col in enumerate(self.ordered_columns):
-            col_key = col.key
-            cell_text: Text = self.get_cell(row_key, col_key)
-
-            if self.selected_rows[ridx] or (col_idx in match_cols):
-                cell_text.style = HIGHLIGHT_COLOR
-            else:
-                # Reset to default style based on dtype
-                dtype = self.df.dtypes[col_idx]
-                dc = DtypeConfig(dtype)
-                cell_text.style = dc.style
-
-            self.update_cell(row_key, col_key, cell_text)
-
-    def do_clear_selections_and_matches(self) -> None:
-        """Clear all selected rows and matches without removing them from the dataframe."""
-        # Check if any selected rows or matches
-        if not any(self.selected_rows) and not self.matches:
-            self.notify("No selections to clear", title="Clear", severity="warning")
-            return
-
-        row_count = sum(
-            1 if (selected or idx in self.matches) else 0 for idx, selected in enumerate(self.selected_rows)
-        )
-
-        # Add to history
-        self.add_history("Cleared all selected rows")
-
-        # Clear all selections
-        self.selected_rows = [False] * len(self.df)
-        self.matches = defaultdict(set)
-
-        # Recreate table for display
-        self.setup_table()
-
-        self.notify(f"Cleared selections for [$success]{row_count}[/] rows", title="Clear")
-
-    # Filter & View
-    def do_filter_rows(self) -> None:
-        """Keep only the rows with selections and cell matches, and remove others."""
-        if any(self.selected_rows) or self.matches:
-            message = "Filter to rows with selection and cell matches (other rows removed)"
-            filter_expr = [
-                True if (selected or ridx in self.matches) else False
-                for ridx, selected in enumerate(self.selected_rows)
-            ]
-        else:  # Search cursor value in current column
-            message = "Filter to rows matching cursor value (other rows removed)"
-            ridx = self.cursor_row_idx
-            cidx = self.cursor_col_idx
-            value = self.df.item(ridx, cidx)
-
-            col_name = self.df.columns[cidx]
-            if value is None:
-                filter_expr = pl.col(col_name).is_null()
-            else:
-                filter_expr = pl.col(col_name) == value
-
-        # Add to history
-        self.add_history(message, dirty=True)
-
-        # Apply filter to dataframe with row indices
-        df_filtered = self.df.with_row_index(RIDX).filter(filter_expr)
-
-        # Update dataframe
-        self.reset_df(df_filtered.drop(RIDX))
-
-        # Recreate table for display
-        self.setup_table()
-
-        self.notify(f"{message}. Now showing [$success]{len(self.df)}[/] rows", title="Filter")
-
+    # View & Filter
     def do_view_rows(self) -> None:
         """View rows.
 
-        If there are selected rows or matches, view those rows.
-        Otherwise, view based on the value of the currently selected cell.
+        If there are selected rows, view those.
+        Otherwise, view based on the cursor value.
         """
 
         cidx = self.cursor_col_idx
-        col_name = self.df.columns[cidx]
+        col_name = self.cursor_col_name
 
-        # If there are rows with selections or matches, use those
-        if any(self.selected_rows) or self.matches:
-            term = [
-                True if (selected or idx in self.matches) else False for idx, selected in enumerate(self.selected_rows)
-            ]
+        # If there are selected rows, use those
+        if self.selected_rows:
+            term = pl.col(RID).is_in(self.selected_rows)
         # Otherwise, use the current cell value
         else:
             ridx = self.cursor_row_idx
@@ -3065,7 +3498,7 @@ class DataFrameTable(DataTable):
         )
 
     def view_rows(self, result) -> None:
-        """Show only rows with selections or matches, and do hide others. Do not modify the dataframe."""
+        """View selected rows and hide others. Do not modify the dataframe."""
         if result is None:
             return
         term, cidx, match_nocase, match_whole = result
@@ -3075,13 +3508,17 @@ class DataFrameTable(DataTable):
         # Support for polars expression
         if isinstance(term, pl.Expr):
             expr = term
+
         # Support for list of booleans (selected rows)
         elif isinstance(term, (list, pl.Series)):
             expr = term
+
+        # Null case
         elif term == NULL:
             expr = pl.col(col_name).is_null()
+
+        # Support for polars expression in string form
         elif tentative_expr(term):
-            # Support for polars expression in string form
             try:
                 expr = validate_expr(term, self.df.columns, cidx)
             except Exception as e:
@@ -3090,6 +3527,8 @@ class DataFrameTable(DataTable):
                 )
                 self.log(f"Error validating expression `{term}`: {str(e)}")
                 return
+
+        # Type-aware search based on column dtype
         else:
             dtype = self.df.dtypes[cidx]
             if dtype == pl.String:
@@ -3113,11 +3552,7 @@ class DataFrameTable(DataTable):
                     )
 
         # Lazyframe with row indices
-        lf = self.df.lazy().with_row_index(RIDX)
-
-        # Apply existing visibility filter first
-        if self.has_hidden_rows:
-            lf = lf.filter(self.visible_rows)
+        lf = self.df.lazy()
 
         expr_str = "boolean list or series" if isinstance(expr, (list, pl.Series)) else str(expr)
 
@@ -3125,7 +3560,7 @@ class DataFrameTable(DataTable):
         try:
             df_filtered = lf.filter(expr).collect()
         except Exception as e:
-            self.histories.pop()  # Remove last history entry
+            self.histories_undo.pop()  # Remove last history entry
             self.notify(f"Error applying filter [$error]{expr_str}[/]", title="Filter", severity="error", timeout=10)
             self.log(f"Error applying filter `{expr_str}`: {str(e)}")
             return
@@ -3138,17 +3573,81 @@ class DataFrameTable(DataTable):
         # Add to history
         self.add_history(f"Filtered by expression [$success]{expr_str}[/]")
 
-        # Mark unfiltered rows as invisible
-        filtered_row_indices = set(df_filtered[RIDX].to_list())
-        if filtered_row_indices:
-            for ridx in range(len(self.visible_rows)):
-                if ridx not in filtered_row_indices:
-                    self.visible_rows[ridx] = False
+        ok_rids = set(df_filtered[RID])
+
+        # Create a view of self.df as a copy
+        if self.df_view is None:
+            self.df_view = self.df
+
+        # Update dataframe
+        self.df = df_filtered
+
+        # Update selected rows
+        if self.selected_rows:
+            self.selected_rows.intersection_update(ok_rids)
+
+        # Update matches
+        if self.matches:
+            self.matches = {rid: cols for rid, cols in self.matches.items() if rid in ok_rids}
+
+        # Recreate table for display
+        self.setup_table()
+
+        self.notify(f"Filtered to [$success]{matched_count}[/] matching row(s)", title="Filter")
+
+    def do_filter_rows(self) -> None:
+        """Filter rows.
+
+        If there are selected rows, use those.
+        Otherwise, filter based on the cursor value.
+        """
+        if self.selected_rows:
+            message = "Filtered to selected rows (other rows removed)"
+            filter_expr = pl.col(RID).is_in(self.selected_rows)
+        else:  # Search cursor value in current column
+            message = "Filtered to rows matching cursor value (other rows removed)"
+            cidx = self.cursor_col_idx
+            col_name = self.df.columns[cidx]
+            value = self.cursor_value
+
+            if value is None:
+                filter_expr = pl.col(col_name).is_null()
+            else:
+                filter_expr = pl.col(col_name) == value
+
+        # Add to history
+        self.add_history(message, dirty=True)
+
+        # Apply filter to dataframe with row indices
+        df_filtered = self.df.lazy().filter(filter_expr).collect()
+        ok_rids = set(df_filtered[RID])
+
+        # Update selected rows
+        if self.selected_rows:
+            selected_rows = {rid for rid in self.selected_rows if rid in ok_rids}
+        else:
+            selected_rows = set()
+
+        # Update matches
+        if self.matches:
+            matches = {rid: cols for rid, cols in self.matches.items() if rid in ok_rids}
+        else:
+            matches = defaultdict(set)
+
+        # Update dataframe
+        self.reset_df(df_filtered)
+
+        # Clear view for filter mode
+        self.df_view = None
+
+        # Restore selected rows and matches
+        self.selected_rows = selected_rows
+        self.matches = matches
 
         # Recreate table for display
         self.setup_table()
 
-        self.notify(f"Filtered to [$success]{matched_count}[/] matching rows", title="Filter")
+        self.notify(f"{message}. Now showing [$success]{len(self.df)}[/] rows.", title="Filter")
 
     # Copy & Save
     def do_copy_to_clipboard(self, content: str, message: str) -> None:
@@ -3174,20 +3673,24 @@ class DataFrameTable(DataTable):
         except FileNotFoundError:
             self.notify("Error copying to clipboard", title="Clipboard", severity="error", timeout=10)
 
-    def do_save_to_file(
-        self, title: str = "Save to File", all_tabs: bool | None = None, task_after_save: str | None = None
-    ) -> None:
+    def do_save_to_file(self, all_tabs: bool | None = None, task_after_save: str | None = None) -> None:
         """Open screen to save file."""
         self._task_after_save = task_after_save
+        tab_count = len(self.app.tabs)
+        save_all = tab_count > 1 and all_tabs is not False
+
+        filepath = Path(self.filename)
+        if save_all:
+            ext = filepath.suffix.lower()
+            if ext in (".xlsx", ".xls"):
+                filename = self.filename
+            else:
+                filename = "all-tabs.xlsx"
+        else:
+            filename = str(filepath.with_stem(self.tabname))
 
-        multi_tab = len(self.app.tabs) > 1
-        filename = (
-            "all-tabs.xlsx"
-            if all_tabs or (all_tabs is None and multi_tab)
-            else str(Path(self.filename).with_stem(self.tabname))
-        )
         self.app.push_screen(
-            SaveFileScreen(filename, title=title, all_tabs=all_tabs, multi_tab=multi_tab),
+            SaveFileScreen(filename, save_all=save_all, tab_count=tab_count),
             callback=self.save_to_file,
         )
 
@@ -3195,13 +3698,11 @@ class DataFrameTable(DataTable):
         """Handle result from SaveFileScreen."""
         if result is None:
             return
-        filename, all_tabs = result
-
-        # Whether to save all tabs (for Excel files)
-        self._all_tabs = all_tabs
+        filename, save_all, overwrite_prompt = result
+        self._save_all = save_all
 
         # Check if file exists
-        if Path(filename).exists():
+        if overwrite_prompt and Path(filename).exists():
             self._pending_filename = filename
             self.app.push_screen(
                 ConfirmScreen("File already exists. Overwrite?"),
@@ -3217,7 +3718,7 @@ class DataFrameTable(DataTable):
         else:
             # Go back to SaveFileScreen to allow user to enter a different name
             self.app.push_screen(
-                SaveFileScreen(self._pending_filename),
+                SaveFileScreen(self._pending_filename, save_all=self._save_all),
                 callback=self.save_to_file,
             )
 
@@ -3225,7 +3726,7 @@ class DataFrameTable(DataTable):
         """Actually save the dataframe to a file."""
         filepath = Path(filename)
         ext = filepath.suffix.lower()
-        if ext.endswith(".gz"):
+        if ext == ".gz":
             ext = Path(filename).with_suffix("").suffix.lower()
 
         fmt = ext.removeprefix(".")
@@ -3237,43 +3738,42 @@ class DataFrameTable(DataTable):
             )
             fmt = "csv"
 
-        # Add to history
-        self.add_history(f"Saved dataframe to [$success]{filename}[/]")
-
+        df = (self.df if self.df_view is None else self.df_view).select(pl.exclude(RID))
         try:
             if fmt == "csv":
-                self.df.write_csv(filename)
+                df.write_csv(filename)
             elif fmt in ("tsv", "tab"):
-                self.df.write_csv(filename, separator="\t")
+                df.write_csv(filename, separator="\t")
             elif fmt in ("xlsx", "xls"):
                 self.save_excel(filename)
             elif fmt == "json":
-                self.df.write_json(filename)
+                df.write_json(filename)
             elif fmt == "ndjson":
-                self.df.write_ndjson(filename)
+                df.write_ndjson(filename)
             elif fmt == "parquet":
-                self.df.write_parquet(filename)
+                df.write_parquet(filename)
             else:  # Fallback to CSV
-                self.df.write_csv(filename)
+                df.write_csv(filename)
 
             # Update current filename
             self.filename = filename
 
             # Reset dirty flag after save
-            if self._all_tabs:
+            if self._save_all:
                 tabs: dict[TabPane, DataFrameTable] = self.app.tabs
                 for table in tabs.values():
                     table.dirty = False
             else:
                 self.dirty = False
 
-            if self._task_after_save == "close_tab":
-                self.app.do_close_tab()
-            elif self._task_after_save == "quit_app":
-                self.app.exit()
+            if hasattr(self, "_task_after_save"):
+                if self._task_after_save == "close_tab":
+                    self.app.do_close_tab()
+                elif self._task_after_save == "quit_app":
+                    self.app.exit()
 
             # From ConfirmScreen callback, so notify accordingly
-            if self._all_tabs:
+            if self._save_all:
                 self.notify(f"Saved all tabs to [$success]{filename}[/]", title="Save to File")
             else:
                 self.notify(f"Saved current tab to [$success]{filename}[/]", title="Save to File")
@@ -3286,16 +3786,18 @@ class DataFrameTable(DataTable):
         """Save to an Excel file."""
         import xlsxwriter
 
-        if not self._all_tabs or len(self.app.tabs) == 1:
+        if not self._save_all or len(self.app.tabs) == 1:
             # Single tab - save directly
-            self.df.write_excel(filename)
+            df = (self.df if self.df_view is None else self.df_view).select(pl.exclude(RID))
+            df.write_excel(filename, worksheet=self.tabname)
         else:
             # Multiple tabs - use xlsxwriter to create multiple sheets
             with xlsxwriter.Workbook(filename) as wb:
                 tabs: dict[TabPane, DataFrameTable] = self.app.tabs
                 for table in tabs.values():
                     worksheet = wb.add_worksheet(table.tabname)
-                    table.df.write_excel(workbook=wb, worksheet=worksheet)
+                    df = (table.df if table.df_view is None else table.df_view).select(pl.exclude(RID))
+                    df.write_excel(workbook=wb, worksheet=worksheet)
 
     # SQL Interface
     def do_simple_sql(self) -> None:
@@ -3339,19 +3841,17 @@ class DataFrameTable(DataTable):
             sql: The SQL query string to execute.
         """
 
-        import re
+        sql = sql.replace("$#", f"(`{RID}` + 1)")
+        if RID not in sql and "*" not in sql:
+            # Ensure RID is selected
+            import re
 
-        RE_FROM_SELF = re.compile(r"\bfrom\s+self\b", re.IGNORECASE)
-
-        sql = RE_FROM_SELF.sub(f", `{RIDX}` FROM self", sql)
+            RE_FROM_SELF = re.compile(r"\bFROM\s+self\b", re.IGNORECASE)
+            sql = RE_FROM_SELF.sub(f", `{RID}` FROM self", sql)
 
         # Execute the SQL query
         try:
-            lf = self.df.lazy().with_row_index(RIDX)
-            if self.has_hidden_rows:
-                lf = lf.filter(self.visible_rows)
-
-            df_filtered = lf.sql(sql).collect()
+            df_filtered = self.df.lazy().sql(sql).collect()
 
             if not len(df_filtered):
                 self.notify(
@@ -3359,29 +3859,34 @@ class DataFrameTable(DataTable):
                 )
                 return
 
-            # Add to history
-            self.add_history(f"SQL Query:\n[$success]{sql}[/]", dirty=not view)
-
-            if view:
-                # Just view - do not modify the dataframe
-                filtered_row_indices = set(df_filtered[RIDX].to_list())
-                if filtered_row_indices:
-                    self.visible_rows = [ridx in filtered_row_indices for ridx in range(len(self.visible_rows))]
-
-                filtered_col_names = set(df_filtered.columns)
-                if filtered_col_names:
-                    self.hidden_columns = {
-                        col_name for col_name in self.df.columns if col_name not in filtered_col_names
-                    }
-            else:  # filter - modify the dataframe
-                self.df = df_filtered.drop(RIDX)
-                self.visible_rows = [True] * len(self.df)
-                self.hidden_columns.clear()
         except Exception as e:
             self.notify(f"Error executing SQL query [$error]{sql}[/]", title="SQL Query", severity="error", timeout=10)
             self.log(f"Error executing SQL query `{sql}`: {str(e)}")
             return
 
+        # Add to history
+        self.add_history(f"SQL Query:\n[$success]{sql}[/]", dirty=not view)
+
+        # Create a view of self.df as a copy
+        if view and self.df_view is None:
+            self.df_view = self.df
+
+        # Clear view for filter mode
+        if not view:
+            self.df_view = None
+
+        # Update dataframe
+        self.df = df_filtered
+        ok_rids = set(df_filtered[RID])
+
+        # Update selected rows
+        if self.selected_rows:
+            self.selected_rows.intersection_update(ok_rids)
+
+        # Update matches
+        if self.matches:
+            self.matches = {rid: cols for rid, cols in self.matches.items() if rid in ok_rids}
+
         # Recreate table for display
         self.setup_table()