diff --git a/package.json b/package.json
index de72f31a1..2ecc80192 100644
--- a/package.json
+++ b/package.json
@@ -26,10 +26,10 @@
     ]
   },
   "devDependencies": {
-    "@abaplint/cli": "^2.97.7",
-    "@abaplint/database-sqlite": "^2.5.39",
-    "@abaplint/runtime": "^2.5.79",
-    "@abaplint/transpiler-cli": "^2.5.79",
+    "@abaplint/cli": "^2.97.9",
+    "@abaplint/database-sqlite": "^2.6.0",
+    "@abaplint/runtime": "^2.6.15",
+    "@abaplint/transpiler-cli": "^2.6.15",
     "abapmerge": "^0.15.0",
     "c8": "^7.13.0",
     "eslint": "^8.38.0"
diff --git a/src/inspect/zcl_abapgit_code_inspector.clas.abap b/src/inspect/zcl_abapgit_code_inspector.clas.abap
index dbb3a2cfa..27d95d81e 100644
--- a/src/inspect/zcl_abapgit_code_inspector.clas.abap
+++ b/src/inspect/zcl_abapgit_code_inspector.clas.abap
@@ -351,6 +351,9 @@ CLASS zcl_abapgit_code_inspector IMPLEMENTATION.
     DATA: lo_set     TYPE REF TO cl_ci_objectset,
           lo_variant TYPE REF TO cl_ci_checkvariant,
           lv_count   TYPE i,
+          lt_list    TYPE scit_alvlist,
+          ls_list    LIKE LINE OF lt_list,
+          ls_result  LIKE LINE OF rt_list,
           lo_timer   TYPE REF TO zcl_abapgit_timer,
           lx_error   TYPE REF TO zcx_abapgit_exception.
 
@@ -371,10 +374,15 @@ CLASS zcl_abapgit_code_inspector IMPLEMENTATION.
           io_set     = lo_set
           io_variant = lo_variant ).
 
-        rt_list = run_inspection( mo_inspection ).
+        lt_list = run_inspection( mo_inspection ).
 
         cleanup( lo_set ).
 
+        LOOP AT lt_list INTO ls_list.
+          MOVE-CORRESPONDING ls_list TO ls_result.
+          INSERT ls_result INTO TABLE rt_list.
+        ENDLOOP.
+
         IF iv_save = abap_true.
           READ TABLE rt_list TRANSPORTING NO FIELDS WITH KEY kind = 'E'.
           mv_success = boolc( sy-subrc <> 0 ).
diff --git a/src/inspect/zif_abapgit_code_inspector.intf.abap b/src/inspect/zif_abapgit_code_inspector.intf.abap
index e2fcb8229..480b21292 100644
--- a/src/inspect/zif_abapgit_code_inspector.intf.abap
+++ b/src/inspect/zif_abapgit_code_inspector.intf.abap
@@ -1,13 +1,28 @@
 INTERFACE zif_abapgit_code_inspector
   PUBLIC .
 
+  TYPES: BEGIN OF ty_result,
+           objtype  TYPE tadir-object,
+           objname  TYPE tadir-obj_name,
+           sobjtype TYPE c LENGTH 4,
+           sobjname TYPE c LENGTH 40,
+           kind     TYPE c LENGTH 1,
+           line     TYPE n LENGTH 6,
+           col      TYPE n LENGTH 4,
+           code     TYPE c LENGTH 10,
+           test     TYPE c LENGTH 30,
+           text     TYPE string,
+           param1   TYPE c LENGTH 80,
+         END OF ty_result.
+
+  TYPES ty_results TYPE STANDARD TABLE OF ty_result WITH DEFAULT KEY.
 
   METHODS run
     IMPORTING
       !iv_variant    TYPE sci_chkv
       !iv_save       TYPE abap_bool DEFAULT abap_false
     RETURNING
-      VALUE(rt_list) TYPE scit_alvlist
+      VALUE(rt_list) TYPE ty_results
     RAISING
       zcx_abapgit_exception .
 
diff --git a/src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.abap
index bee484584..5572c640a 100644
--- a/src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.abap
+++ b/src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.abap
@@ -16,7 +16,7 @@ CLASS zcl_abapgit_gui_page_codi_base DEFINITION PUBLIC ABSTRACT INHERITING FROM
         commit TYPE string VALUE 'commit' ##NO_TEXT,
       END OF c_actions .
     DATA mo_repo TYPE REF TO zcl_abapgit_repo .
-    DATA mt_result TYPE scit_alvlist .
+    DATA mt_result TYPE zif_abapgit_code_inspector=>ty_results .
     DATA mv_summary TYPE string.
 
     METHODS render_variant
@@ -28,14 +28,14 @@ CLASS zcl_abapgit_gui_page_codi_base DEFINITION PUBLIC ABSTRACT INHERITING FROM
     METHODS render_result
       IMPORTING
         !ii_html   TYPE REF TO zif_abapgit_html
-        !it_result TYPE scit_alvlist .
+        !it_result TYPE zif_abapgit_code_inspector=>ty_results .
     METHODS render_result_line
       IMPORTING
         !ii_html   TYPE REF TO zif_abapgit_html
-        !is_result TYPE scir_alvlist .
+        !is_result TYPE zif_abapgit_code_inspector=>ty_result .
     METHODS build_nav_link
       IMPORTING
-        !is_result     TYPE scir_alvlist
+        !is_result     TYPE zif_abapgit_code_inspector=>ty_result
       RETURNING
         VALUE(rv_link) TYPE string .
     METHODS jump
@@ -55,7 +55,7 @@ ENDCLASS.
 
 
 
-CLASS zcl_abapgit_gui_page_codi_base IMPLEMENTATION.
+CLASS ZCL_ABAPGIT_GUI_PAGE_CODI_BASE IMPLEMENTATION.
 
 
   METHOD build_base_menu.
@@ -107,7 +107,7 @@ CLASS zcl_abapgit_gui_page_codi_base IMPLEMENTATION.
           ls_item             TYPE zif_abapgit_definitions=>ty_item,
           ls_sub_item         TYPE zif_abapgit_definitions=>ty_item.
 
-    FIELD-SYMBOLS: <ls_result> TYPE scir_alvlist.
+    FIELD-SYMBOLS: <ls_result> LIKE LINE OF mt_result.
 
 
     IF is_sub_item IS NOT INITIAL.
@@ -172,7 +172,7 @@ CLASS zcl_abapgit_gui_page_codi_base IMPLEMENTATION.
   METHOD render_result.
 
     CONSTANTS: lc_limit TYPE i VALUE 500.
-    FIELD-SYMBOLS: <ls_result> TYPE scir_alvlist.
+    FIELD-SYMBOLS: <ls_result> LIKE LINE OF it_result.
 
     ii_html->add( '<div class="ci-result">' ).