diff --git a/src/01/00/03/z2ui5_cl_util.clas.abap b/src/01/00/03/z2ui5_cl_util.clas.abap
index 90fd31ba..4141d33b 100644
--- a/src/01/00/03/z2ui5_cl_util.clas.abap
+++ b/src/01/00/03/z2ui5_cl_util.clas.abap
@@ -37,12 +37,6 @@ CLASS z2ui5_cl_util DEFINITION
       END OF ty_s_range.
     TYPES ty_t_range TYPE STANDARD TABLE OF ty_s_range WITH EMPTY KEY.
 
-    TYPES:
-      BEGIN OF ty_s_sql,
-        tabname TYPE string,
-        where   TYPE string,
-      END OF ty_s_sql.
-
     TYPES:
       BEGIN OF ty_s_filter_multi,
         name            TYPE string,
@@ -50,11 +44,18 @@ CLASS z2ui5_cl_util DEFINITION
         t_token         TYPE ty_t_token,
         t_token_added   TYPE ty_t_token,
         t_token_removed TYPE ty_t_token,
-        s_sql           TYPE ty_S_sql,
-        sql_text        TYPE string,
       END OF ty_s_filter_multi.
     TYPES ty_t_filter_multi TYPE STANDARD TABLE OF ty_s_filter_multi WITH EMPTY KEY.
 
+    TYPES:
+      BEGIN OF ty_S_sql,
+        tabname    TYPE string,
+        up_to_rows TYPE i,
+        t_ref      TYPE REF TO data,
+        where      TYPE string,
+        t_filter   TYPE ty_t_filter_multi,
+      END OF ty_s_sql.
+
     CLASS-METHODS rtti_get_t_attri_by_include
       IMPORTING
         type          TYPE REF TO cl_abap_datadescr
diff --git a/src/01/02/z2ui5_cl_core_ui5_app.clas.abap b/src/01/02/z2ui5_cl_core_ui5_app.clas.abap
index d61f7f0e..b7ce6e5a 100644
--- a/src/01/02/z2ui5_cl_core_ui5_app.clas.abap
+++ b/src/01/02/z2ui5_cl_core_ui5_app.clas.abap
@@ -168,33 +168,39 @@ CLASS z2ui5_cl_core_ui5_app IMPLEMENTATION.
 
   METHOD controller_app_js.
 
-    result =  `          sap.ui.define(["sap/ui/core/mvc/Controller",  "z2ui5/controller/View1.controller", "sap/ui/core/BusyIndicator" , "z2ui5/cc/DebugTool" ], function(BaseController, Controller, BusyIndicator, DebugTool){` && |\n| &&
-                 `              return BaseController.extend("z2ui5.controller.App", {` && |\n| &&
-                 `                  onInit: async function(){` && |\n| &&
-                 `                      BusyIndicator.show();` && |\n| &&
-                 `                     try {` && |\n| &&
-                 `                       sap.z2ui5.oLaunchpadService = await this.getOwnerComponent().getService("ShellUIService");   ` && |\n|  &&
-                 `                    } catch (e) {}     ` && |\n|  &&
-                 `                    try {                                  ` && |\n|  &&
-                 `                       sap.z2ui5.startupParameters = this.getOwnerComponent().getComponentData().startupParameters;   ` && |\n|  &&
-                 `                    } catch (e) {}              ` && |\n| &&
-                 `                      sap.z2ui5.oController = new Controller();` && |\n| &&
-                 `                      sap.z2ui5.oControllerNest = new Controller();` && |\n| &&
-                 `                      sap.z2ui5.oControllerNest2 = new Controller();` && |\n| &&
-                 `                      sap.z2ui5.oControllerPopup = new Controller();` && |\n| &&
-                 `                      sap.z2ui5.oControllerPopover = new Controller();` && |\n| &&
-                 `                      sap.z2ui5.checkNestAfter = false;` && |\n| &&
-                 `                      sap.z2ui5.oBody = { };` && |\n| &&
-                 `                      sap.z2ui5.oController.setApp(this.getView());` && |\n| &&
-                 `                      sap.z2ui5.onBeforeRoundtrip = [];` && |\n| &&
-                 `                      sap.z2ui5.onAfterRendering = [];` && |\n| &&
-                 `                      sap.z2ui5.onBeforeEventFrontend = [];` && |\n| &&
-                 `                      sap.z2ui5.onAfterRoundtrip = []; ` && |\n| &&
-                 `                      sap.z2ui5.DebugTool = new DebugTool()` && |\n| &&
-                 `                      sap.z2ui5.oController.Roundtrip();` && |\n| &&
-                 `                  }` && |\n| &&
-                 `              });` && |\n| &&
-                 `          });`.
+    result =  `sap.ui.define([` && |\n|  &&
+              `    "sap/ui/core/mvc/Controller",` && |\n|  &&
+              `    "sap/ui/core/BusyIndicator",` && |\n|  &&
+              `    "z2ui5/controller/View1.controller"` && |\n|  &&
+              `], function(BaseController, BusyIndicator, Controller) {` && |\n|  &&
+              `    return BaseController.extend("z2ui5.controller.App", {` && |\n|  &&
+              `        onInit: async function() {` && |\n|  &&
+              |\n|  &&
+              `            BusyIndicator.show();` && |\n|  &&
+              `            try {` && |\n|  &&
+              `                sap.z2ui5.oLaunchpadService = await this.getOwnerComponent().getService("ShellUIService");` && |\n|  &&
+              `            } catch (e) {}` && |\n|  &&
+              `            try {` && |\n|  &&
+              `                sap.z2ui5.ComponentData = this.getOwnerComponent().getComponentData();` && |\n|  &&
+              `                sap.z2ui5.startupParameters = this.getOwnerComponent().getComponentData().startupParameters;` && |\n|  &&
+              `            } catch (e) {}` && |\n|  &&
+              `            sap.z2ui5.oController = new Controller();` && |\n|  &&
+              `            sap.z2ui5.oControllerNest = new Controller();` && |\n|  &&
+              `            sap.z2ui5.oControllerNest2 = new Controller();` && |\n|  &&
+              `            sap.z2ui5.oControllerPopup = new Controller();` && |\n|  &&
+              `            sap.z2ui5.oControllerPopover = new Controller();` && |\n|  &&
+              `            sap.z2ui5.checkNestAfter = false;` && |\n|  &&
+              `            sap.z2ui5.oBody = {};` && |\n|  &&
+              `            sap.z2ui5.oController.setApp(this.getView());` && |\n|  &&
+              `            sap.z2ui5.oController.Roundtrip();` && |\n|  &&
+              `            sap.z2ui5.onBeforeRoundtrip = [];` && |\n|  &&
+              `            sap.z2ui5.onAfterRendering = [];` && |\n|  &&
+              `            sap.z2ui5.onBeforeEventFrontend = [];` && |\n|  &&
+              `            sap.z2ui5.onAfterRoundtrip = [];` && |\n|  &&
+              |\n|  &&
+              `        }` && |\n|  &&
+              `    });` && |\n|  &&
+              `});`.
 
   ENDMETHOD.