diff --git a/src/01/02/01/z2ui5_cl_core_dissolve_srv.clas.abap b/src/01/02/01/z2ui5_cl_core_dissolve_srv.clas.abap
index a1bff958..f9d26958 100644
--- a/src/01/02/01/z2ui5_cl_core_dissolve_srv.clas.abap
+++ b/src/01/02/01/z2ui5_cl_core_dissolve_srv.clas.abap
@@ -147,11 +147,12 @@ CLASS z2ui5_cl_core_dissolve_srv IMPLEMENTATION.
 
   METHOD main.
 
-    IF mt_attri->* IS INITIAL.
-      main_init( ).
-      RETURN.
-    ENDIF.
+*    IF mt_attri->* IS INITIAL.
+*      main_init( ).
+*      RETURN.
+*    ENDIF.
 
+    main_init( ).
     IF line_exists( mt_attri->*[ check_dissolved = abap_false ] ).
       main_run( ).
     ENDIF.
@@ -160,11 +161,13 @@ CLASS z2ui5_cl_core_dissolve_srv IMPLEMENTATION.
 
 
   METHOD main_init.
+    TRY.
+        DATA(ls_attri) = VALUE z2ui5_if_core_types=>ty_s_attri( r_ref = REF #( mo_app ) ).
+        DATA(lt_init) = diss_oref( REF #( ls_attri ) ).
+        INSERT LINES OF lt_init INTO TABLE mt_attri->*.
 
-    DATA(ls_attri) = VALUE z2ui5_if_core_types=>ty_s_attri( r_ref = REF #( mo_app ) ).
-    DATA(lt_init) = diss_oref( REF #( ls_attri ) ).
-    INSERT LINES OF lt_init INTO TABLE mt_attri->*.
-
+      CATCH cx_root.
+    ENDTRY.
   ENDMETHOD.
 
 
@@ -173,7 +176,8 @@ CLASS z2ui5_cl_core_dissolve_srv IMPLEMENTATION.
     DATA(lt_attri_new) = VALUE z2ui5_if_core_types=>ty_t_attri( ).
 
     LOOP AT mt_attri->* REFERENCE INTO DATA(lr_attri)
-         WHERE check_dissolved = abap_false.
+         WHERE check_dissolved = abap_false
+         AND bind_type <> z2ui5_if_core_types=>cs_bind_type-one_time.
 
       lr_attri->check_dissolved = abap_true.
 
diff --git a/src/01/04/z2ui5_cl_fw_cc_debugging_tools.clas.abap b/src/01/04/z2ui5_cl_fw_cc_debugging_tools.clas.abap
index a02f4216..70ab964c 100644
--- a/src/01/04/z2ui5_cl_fw_cc_debugging_tools.clas.abap
+++ b/src/01/04/z2ui5_cl_fw_cc_debugging_tools.clas.abap
@@ -20,6 +20,7 @@ CLASS Z2UI5_CL_FW_CC_DEBUGGING_TOOLS IMPLEMENTATION.
 
   METHOD get_js.
 
+
     result = `` && |\n|  &&
              `sap.ui.define( "z2ui5/DebuggingTools" ,[` && |\n|  &&
               `    "sap/ui/core/Control",` && |\n|  &&
@@ -136,7 +137,7 @@ CLASS Z2UI5_CL_FW_CC_DEBUGGING_TOOLS IMPLEMENTATION.
              `                    displayEditor (oEvent, content, type, xcontent = "") {` && |\n|  &&
              `                        oEvent.getSource().getModel().oData.editor_visible = true;` && |\n|  &&
              `                        oEvent.getSource().getModel().oData.source_visible = false;` && |\n|  &&
-             `                        oEvent.getSource().getModel().oData.isTemplating = content.includes("xmlns:template") ? true : false;` && |\n|  &&
+             `                        oEvent.getSource().getModel().oData.isTemplating = content?.includes("xmlns:template") ? true : false;` && |\n|  &&
              `                        oEvent.getSource().getModel().oData.value = content;` && |\n|  &&
              `                        oEvent.getSource().getModel().oData.previousValue = content;` && |\n|  &&
              `                        oEvent.getSource().getModel().oData.xContent = xcontent;` && |\n|  &&