diff --git a/src/app_controller.py b/src/app_controller.py
index 8a33c2fc..6e8915e0 100644
--- a/src/app_controller.py
+++ b/src/app_controller.py
@@ -2275,7 +2275,7 @@ class AppController:
         script = payload.get('script') or json.dumps(payload.get('args', {}), indent=1)
         script = _resolve_log_ref(script, session_dir)
         entry_obj = {
-         'source_tier': entry.get('source_tier', 'main'),
+         'source_tier': entry['source_tier'] if 'source_tier' in entry else 'main',
          'script': script,
          'result': '', # Waiting for result
          'ts': ts
@@ -2300,7 +2300,7 @@ class AppController:
         u = payload['usage']
         for k in ['input_tokens', 'output_tokens', 'cache_read_input_tokens', 'cache_creation_input_tokens', 'total_tokens']:
          if k in new_usage: new_usage[k] += u.get(k, 0) or 0
-        tier = entry.get('source_tier', 'main')
+        tier = entry['source_tier'] if 'source_tier' in entry else 'main'
         if tier in new_mma_usage:
          new_mma_usage[tier]['input'] += u.get('input_tokens', 0) or 0
          new_mma_usage[tier]['output'] += u.get('output_tokens', 0) or 0
@@ -2308,7 +2308,7 @@ class AppController:
          'time': ts,
          'input': u.get('input_tokens', 0) or 0,
          'output': u.get('output_tokens', 0) or 0,
-         'model': entry.get('model', 'unknown')
+         'model': entry['model'] if 'model' in entry else 'unknown'
         })
 
        if kind == "history_add":
diff --git a/src/gui_2.py b/src/gui_2.py
index edf6c9dd..28586cfd 100644
--- a/src/gui_2.py
+++ b/src/gui_2.py
@@ -5800,7 +5800,7 @@ def render_tool_calls_panel(app: App) -> None:
     app.show_windows["Text Viewer"] = True
 
    imgui.table_next_column()
-   imgui.text_colored(C_SUB(), f"[{entry.get('source_tier', 'main')}]")
+   imgui.text_colored(C_SUB(), f"[{entry['source_tier'] if 'source_tier' in entry else 'main'}]")
 
    imgui.table_next_column()
    script_preview = script.replace("\n", " ")[:150]