diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index 0a23206c..9f5533bd 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -160,9 +160,9 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `            },` && |\n|  &&
                            `            Roundtrip: function (isHoldView) {` && |\n|  &&
                            `                sap.z2ui5.checkTimerActive = false;` && |\n|  &&
-                           `                if (sap.z2ui5.oView && !isHoldView) {` && |\n|  &&
+                           `                if (sap.z2ui5.oView ) { if (!isHoldView ) {` && |\n|  &&
                            `                    sap.z2ui5.oView.destroy();` && |\n|  &&
-                           `                }` && |\n|  &&
+                           `                } }` && |\n|  &&
                            `                var xhr = new XMLHttpRequest();` && |\n|  &&
                            `             //   var url = "/sap/bc/http/sap/y2ui5_http_handler/";` && |\n|  &&
                            `             //   xhr.open("POST", url, true);` && |\n|  &&
diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index abc6d6e7..aa39973e 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -478,12 +478,6 @@ CLASS z2ui5_lcl_utility_tree_json DEFINITION.
       RETURNING
         VALUE(result) TYPE string.
 
-    METHODS add_list_val
-      IMPORTING
-        v             TYPE string
-      RETURNING
-        VALUE(result) TYPE REF TO z2ui5_lcl_utility_tree_json.
-
     METHODS add_attribute
       IMPORTING
         n             TYPE clike
@@ -504,20 +498,6 @@ CLASS z2ui5_lcl_utility_tree_json DEFINITION.
       RETURNING
         VALUE(result) TYPE REF TO z2ui5_lcl_utility_tree_json.
 
-    METHODS add_list_object
-      RETURNING
-        VALUE(result) TYPE REF TO z2ui5_lcl_utility_tree_json.
-
-    METHODS add_list_list
-      RETURNING
-        VALUE(result) TYPE REF TO z2ui5_lcl_utility_tree_json.
-
-    METHODS add_attribute_list
-      IMPORTING
-        name          TYPE clike
-      RETURNING
-        VALUE(result) TYPE REF TO z2ui5_lcl_utility_tree_json.
-
     METHODS add_attribute_instance
       IMPORTING
         val           TYPE REF TO z2ui5_lcl_utility_tree_json
@@ -577,15 +557,6 @@ CLASS z2ui5_lcl_utility_tree_json IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD add_attribute_list.
-
-    result = add_attribute_object( name ).
-    result->mv_check_list = abap_true.
-
-  ENDMETHOD.
-
-
   METHOD add_attribute_struc.
 
     FIELD-SYMBOLS <value> TYPE any.
@@ -610,35 +581,6 @@ CLASS z2ui5_lcl_utility_tree_json IMPLEMENTATION.
 
   ENDMETHOD.
 
-
-  METHOD add_list_list.
-
-    result = add_attribute_list( CONV string( lines( mt_values ) ) ).
-
-  ENDMETHOD.
-
-
-  METHOD add_list_object.
-
-    result = add_attribute_object( CONV string( lines( mt_values ) ) ).
-
-  ENDMETHOD.
-
-
-  METHOD add_list_val.
-
-    DATA(lo_attri) = new( io_root = mo_root iv_name = lines( mt_values ) ).
-    lo_attri->mv_value = v.
-    lo_attri->mv_apost_active = abap_true.
-
-    mt_values = VALUE #( BASE mt_values ( lo_attri ) ).
-    lo_attri->mo_parent = me.
-    result = lo_attri.
-    result = me.
-
-  ENDMETHOD.
-
-
   METHOD constructor.
 
     mo_root = me.
@@ -1077,7 +1019,7 @@ CLASS z2ui5_lcl_fw_app IMPLEMENTATION.
                         ` > <headerContent ` && |\n|  &&
                         ` > <Title ` && |\n|  &&
                         ` /> <Title ` && |\n|  &&
-                        `  text="abap2UI5 - Development of UI5 Apps in pure ABAP" ` && |\n|  &&
+                        `  text="abap2UI5 - Developing UI5 Apps in pure ABAP" ` && |\n|  &&
                         ` /> <ToolbarSpacer ` && |\n|  &&
                         ` /> <Link ` && |\n|  &&
                         `  text="SCN" ` && |\n|  &&
@@ -1164,8 +1106,8 @@ CLASS z2ui5_lcl_fw_app IMPLEMENTATION.
         lv_check_demo = abap_false.
     ENDTRY.
     IF lv_check_demo = abap_false.
-      lv_xml_main = lv_xml_main && `<MessageStrip text="The abap2UI5 demos aren't ready! Make sure to install this additional demo repository." type="Warning" > <link> ` &&
-         `   <Link text="(LINK)"  target="_blank" href="https://github.com/oblomov-dev/abap2UI5-demos" /> ` &&
+      lv_xml_main = lv_xml_main && `<MessageStrip text="Oops! You need to install abap2UI5 demos before continuing..." type="Warning" > <link> ` &&
+         `   <Link text="(HERE)"  target="_blank" href="https://github.com/oblomov-dev/abap2UI5-demos" /> ` &&
       `  </link> </MessageStrip>`.
     ENDIF.
 
diff --git a/src/z2ui5_cl_http_handler.clas.testclasses.abap b/src/z2ui5_cl_http_handler.clas.testclasses.abap
index 990c3328..11da8471 100644
--- a/src/z2ui5_cl_http_handler.clas.testclasses.abap
+++ b/src/z2ui5_cl_http_handler.clas.testclasses.abap
@@ -23,7 +23,6 @@ CLASS ltcl_unit_01_utility DEFINITION FINAL FOR TESTING
     METHODS test_util_uuid_session  FOR TESTING RAISING cx_static_check.
     METHODS test_util_04_attri_by_ref  FOR TESTING RAISING cx_static_check.
     METHODS test_util_01_get_t_attri  FOR TESTING RAISING cx_static_check.
-    METHODS test_util_03_get_t_attri_struc  FOR TESTING RAISING cx_static_check.
     METHODS test_util_02_get_attri  FOR TESTING RAISING cx_static_check.
 ENDCLASS.
 
@@ -260,14 +259,6 @@ CLASS ltcl_unit_01_utility IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD test_util_03_get_t_attri_struc.
-
-* DATA(lo_app) = NEW ltcl_unit_04_deep_data( ).
-*
-*    lcl_utility=>_get_t_attri_by_struc
-
-  ENDMETHOD.
-
 ENDCLASS.
 
 CLASS ltcl_unit_02_app_start DEFINITION FINAL FOR TESTING