diff --git a/plugin/att/att.py b/plugin/att/att.py
index ae66f5049d..7195bae862 100755
--- a/plugin/att/att.py
+++ b/plugin/att/att.py
@@ -588,13 +588,17 @@ if __name__ == "__main__":
             dump_csv(code, trace_instance_name, bIsAuto)
 
         if FILE_MODE:
+            try:
+                dispatchNames = {id: codeservice.getSymbolName(addr) for id, addr in kernel_addr.items()}
+            except:
+                dispatchNames = {id: "#addr"+str(addr) for id, addr in kernel_addr.items()}
             drawinfo = {
                 "TIMELINES": gen_timelines(DBFILES),
                 "EVENTS": EVENTS,
                 "EVENT_NAMES": EVENT_NAMES,
                 "OCCUPANCY": OCCUPANCY,
                 "ShaderNames": occupancy_filenames,
-                "DispatchNames": {id: codeservice.getSymbolName(addr) for id, addr in kernel_addr.items()}
+                "DispatchNames": dispatchNames
             }
             view_trace(
                 code,
diff --git a/plugin/att/trace_view.py b/plugin/att/trace_view.py
index e11b882bc7..1e9ae2cec1 100755
--- a/plugin/att/trace_view.py
+++ b/plugin/att/trace_view.py
@@ -92,7 +92,7 @@ def extract_data(df, se_number):
         ]
         timeline = df["timeline"][wave_id]
 
-        if len(stitched) == 0 or len(timeline) == 0 or len(stitched) != num_insts:
+        if len(stitched) == 0 or len(timeline) == 0:
             continue
 
         allwaves_maxline = max(allwaves_maxline, maxline)
@@ -214,7 +214,7 @@ def view_trace(
             flight_count.append(count)
             simd_wave_filenames[se_number] = wv_filenames
 
-    code_sel = [c[:-3]+c[-2:] for c in code[:allse_maxline+16]]
+    code_sel = [c[:-3]+c[-2:] for c in code]
     JSON_GLOBAL_DICTIONARY['code.json'] = Readable({"code": code_sel, "top_n": get_top_n(code_sel)})
 
     for key in simd_wave_filenames.keys():