diff --git a/cognee/cli/commands/tui_command.py b/cognee/cli/commands/tui_command.py
index 19f46a18e..b13b1f078 100644
--- a/cognee/cli/commands/tui_command.py
+++ b/cognee/cli/commands/tui_command.py
@@ -4,8 +4,6 @@ from cognee.cli.config import DEFAULT_DOCS_URL
 import cognee.cli.echo as fmt
 from cognee.cli.exceptions import CliCommandException
 from cognee.cli.tui.home_screen import HomeScreen
-from textual.app import App
-from cognee.shared.logging_utils import setup_logging
 
 
 class TuiCommand(SupportsCliCommand):
@@ -27,7 +25,8 @@ class TuiCommand(SupportsCliCommand):
 
     def execute(self, args: argparse.Namespace) -> None:
         try:
-
+            from textual.app import App
+            from cognee.shared.logging_utils import setup_logging
             class CogneeTUI(App):
                 """Main TUI application for cognee."""
 
diff --git a/cognee/cli/tui/delete_screen.py b/cognee/cli/tui/delete_screen.py
index 8fd1cc99b..feeb26769 100644
--- a/cognee/cli/tui/delete_screen.py
+++ b/cognee/cli/tui/delete_screen.py
@@ -129,14 +129,16 @@ class DeleteTUIScreen(BaseTUIScreen):
             if dataset_name:
                 if user_id is None:
                     user = await get_default_user()
-                    user_id = user.id
-                await delete_dataset_by_name(dataset_name, user_id)
+                    resolved_user_id = user.id
+                else:
+                    resolved_user_id = UUID(user_id)
+                await delete_dataset_by_name(dataset_name, resolved_user_id)
             else:
-                await delete_data_by_user(UUID(user_id))
+                await delete_data_by_user(resolved_user_id)
+            status.update(f"✓ Successfully deleted dataset '{dataset_name}'.")
         except Exception as e:
             status.update(f"✗ Error: {str(e)}")
         finally:
-            status.update(f"✓ Successfully deleted dataset '{dataset_name}'.")
             self.is_processing = False
             self.clear_input()
 
@@ -161,10 +163,12 @@ class DeleteTUIScreen(BaseTUIScreen):
         try:
             status.update("🔍 Deleting all data...")
             if user_id is None:
-                user = await get_default_user()
-                user_id = user.id
-            await delete_data_by_user(user_id)
-            status.update(f"✓ Successfully deleted all data by user ")
+                user = await get_default_user() 
+                resolved_user_id = user.id
+            else:
+                resolved_user_id = UUID(user_id)
+            await delete_data_by_user(resolved_user_id)
+            status.update(f"✓ Successfully deleted all data by user {resolved_user_id}")
 
             # Clear inputs
             dataset_input = self.query_one("#dataset-input", Input)
diff --git a/cognee/cli/tui/home_screen.py b/cognee/cli/tui/home_screen.py
index d23061175..22165bd1d 100644
--- a/cognee/cli/tui/home_screen.py
+++ b/cognee/cli/tui/home_screen.py
@@ -163,6 +163,8 @@ class HomeScreen(BaseTUIScreen):
 
     def on_list_view_selected(self, event: ListView.Selected) -> None:
         selected_index = event.index
+        self.current_index = selected_index
+        self._apply_highlight()
         if selected_index == 0:  # add
             self.app.push_screen(AddTUIScreen())
         elif selected_index == 1:  # search
diff --git a/cognee/cli/tui/search_screen.py b/cognee/cli/tui/search_screen.py
index 97a292762..d70d29bd1 100644
--- a/cognee/cli/tui/search_screen.py
+++ b/cognee/cli/tui/search_screen.py
@@ -71,7 +71,7 @@ class SearchTUIScreen(BaseTUIScreen):
                         ("RAG Completion", "RAG_COMPLETION"),
                         ("Chunks", "CHUNKS"),
                         ("Summaries", "SUMMARIES"),
-                        ("Code", "CODE"),
+                        ("Coding Rules", "CODING_RULES"),
                     ],
                     value="GRAPH_COMPLETION",
                     id="query-type-select",
diff --git a/cognee/modules/data/methods/delete_data_by_user.py b/cognee/modules/data/methods/delete_data_by_user.py
index ab4a5aad7..4358bd8e1 100644
--- a/cognee/modules/data/methods/delete_data_by_user.py
+++ b/cognee/modules/data/methods/delete_data_by_user.py
@@ -19,16 +19,13 @@ async def delete_data_by_user(user_id: UUID):
         user_id: UUID of the user whose data should be deleted
 
     Raises:
-        ValueError: If user is not found
+        EntityNotFoundError: If user is not found
     """
     db_engine = get_relational_engine()
 
     async with db_engine.get_async_session() as session:
         # Verify user exists
-        user = await get_user(user_id)
-        if not user:
-            raise ValueError(f"User with ID {user_id} not found")
-
+        await get_user(user_id)
         # Get all datasets owned by this user
         datasets_query = select(Dataset.id).where(Dataset.owner_id == user_id)
         user_datasets_ids = (await session.execute(datasets_query)).scalars().all()