diff --git a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap b/src/ui/zcl_abapgit_html_viewer_gui.clas.abap
index 1649cec6d..4900ff59d 100644
--- a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap
+++ b/src/ui/zcl_abapgit_html_viewer_gui.clas.abap
@@ -7,7 +7,10 @@ CLASS zcl_abapgit_html_viewer_gui DEFINITION
 
     INTERFACES zif_abapgit_html_viewer .
 
-    METHODS constructor .
+    METHODS constructor
+      IMPORTING
+        !io_container           TYPE REF TO cl_gui_container DEFAULT cl_gui_container=>screen0
+        !iv_disable_query_table TYPE abap_bool DEFAULT abap_true .
   PROTECTED SECTION.
 
     DATA mo_html_viewer TYPE REF TO cl_gui_html_viewer .
@@ -36,8 +39,8 @@ CLASS zcl_abapgit_html_viewer_gui IMPLEMENTATION.
 
     CREATE OBJECT mo_html_viewer
       EXPORTING
-        query_table_disabled = abap_true
-        parent               = cl_gui_container=>screen0.
+        query_table_disabled = iv_disable_query_table
+        parent               = io_container.
 
     ls_event-eventid    = zif_abapgit_html_viewer=>m_id_sapevent.
     ls_event-appl_event = abap_true.
diff --git a/src/ui/zcl_abapgit_ui_factory.clas.abap b/src/ui/zcl_abapgit_ui_factory.clas.abap
index 8d36d354c..bc0389cc4 100644
--- a/src/ui/zcl_abapgit_ui_factory.clas.abap
+++ b/src/ui/zcl_abapgit_ui_factory.clas.abap
@@ -33,8 +33,11 @@ CLASS zcl_abapgit_ui_factory DEFINITION
       RETURNING
         VALUE(ri_fe_serv) TYPE REF TO zif_abapgit_frontend_services .
     CLASS-METHODS get_html_viewer
+      IMPORTING
+        !io_container           TYPE REF TO cl_gui_container DEFAULT cl_gui_container=>screen0
+        !iv_disable_query_table TYPE abap_bool DEFAULT abap_true
       RETURNING
-        VALUE(ri_viewer) TYPE REF TO zif_abapgit_html_viewer .
+        VALUE(ri_viewer)        TYPE REF TO zif_abapgit_html_viewer .
   PROTECTED SECTION.
   PRIVATE SECTION.
 
@@ -49,7 +52,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION.
+CLASS zcl_abapgit_ui_factory IMPLEMENTATION.
 
 
   METHOD get_asset_manager.
@@ -181,7 +184,10 @@ CLASS ZCL_ABAPGIT_UI_FACTORY IMPLEMENTATION.
   METHOD get_html_viewer.
 
     IF gi_html_viewer IS NOT BOUND.
-      CREATE OBJECT gi_html_viewer TYPE zcl_abapgit_html_viewer_gui.
+      CREATE OBJECT gi_html_viewer TYPE zcl_abapgit_html_viewer_gui
+        EXPORTING
+          io_container           = io_container
+          iv_disable_query_table = iv_disable_query_table.
     ENDIF.
 
     ri_viewer = gi_html_viewer.