diff --git a/src/z2ui5_cl_demo_app_080.clas.abap b/src/z2ui5_cl_demo_app_080.clas.abap
index 1f4e5ffa..90077eea 100644
--- a/src/z2ui5_cl_demo_app_080.clas.abap
+++ b/src/z2ui5_cl_demo_app_080.clas.abap
@@ -14,7 +14,7 @@ PUBLIC
         type      TYPE string,
         info      TYPE string,
         pic       TYPE string,
-        tentative TYPE boolean,
+        tentative TYPE abap_bool,
       END OF ty_s_appointments .
     TYPES:
       BEGIN OF ty_s_headers,
@@ -24,7 +24,7 @@ PUBLIC
         type      TYPE string,
         info      TYPE string,
         pic       TYPE string,
-        tentative TYPE boolean,
+        tentative TYPE abap_bool,
       END OF ty_s_headers .
     TYPES:
       BEGIN OF ty_s_people,
@@ -51,7 +51,7 @@ ENDCLASS.
 
 
 
-CLASS z2ui5_cl_demo_app_080 IMPLEMENTATION.
+CLASS Z2UI5_CL_DEMO_APP_080 IMPLEMENTATION.
 
 
   METHOD z2ui5_display_view.
@@ -83,11 +83,11 @@ CLASS z2ui5_cl_demo_app_080 IMPLEMENTATION.
 
     DATA(lo_rows) = lo_planningcalendar->rows( ).
     DATA(lo_planningcalendarrow) = lo_rows->planning_calendar_row(
-                                                     appointments = `{path:'APPOINTMENTS'}`
+                                                     appointments = `{path:'APPOINTMENTS', templateShareable: false}`
                                                      icon =  '{PIC}'
                                                      title = '{NAME}'
                                                      text = '{ROLE}'
-                                                     intervalheaders = `{path:'HEADERS'}`
+                                                     intervalheaders = `{path:'HEADERS', templateShareable: false}`
                                                      ).
     lo_planningcalendarrow->appointments( )->calendar_appointment(
                                                                   startdate = `{= Helper.DateCreateObject(${START} ) }`
diff --git a/src/z2ui5_cl_demo_app_173.clas.abap b/src/z2ui5_cl_demo_app_173.clas.abap
index 5c763188..d71916fc 100644
--- a/src/z2ui5_cl_demo_app_173.clas.abap
+++ b/src/z2ui5_cl_demo_app_173.clas.abap
@@ -51,13 +51,13 @@ CLASS Z2UI5_CL_DEMO_APP_173 IMPLEMENTATION.
     view->shell( )->page(
     )->table( items = client->_bind( mt_data )
       )->columns(
-        )->template_repeat( list = `{/MT_LAYOUT}` var = `LO`
+        )->template_repeat( list = `{template>/MT_LAYOUT}` var = `LO`
           )->column( mergeduplicates = `{LO>MERGE}` visible = `{LO>VISIBLE}` )->get_parent(
         )->get_parent( )->get_parent(
         )->items(
           )->column_list_item(
             )->cells(
-              )->template_repeat( list = `{/MT_LAYOUT}` var = `LO2`
+              )->template_repeat( list = `{template>/MT_LAYOUT}` var = `LO2`
                 )->object_identifier( text = `{LO2>BINDING}` ).
 
      client->view_display( view->stringify( ) ).
diff --git a/src/z2ui5_cl_demo_app_176.clas.abap b/src/z2ui5_cl_demo_app_176.clas.abap
index 91cea95e..d520b67a 100644
--- a/src/z2ui5_cl_demo_app_176.clas.abap
+++ b/src/z2ui5_cl_demo_app_176.clas.abap
@@ -78,13 +78,13 @@ CLASS Z2UI5_CL_DEMO_APP_176 IMPLEMENTATION.
     lo_view_nested->shell( )->page(
     )->table( items = i_client->_bind( mt_data )
       )->columns(
-        )->template_repeat( list = `{/MT_LAYOUT}` var = `LO`
+        )->template_repeat( list = `{template>/MT_LAYOUT}` var = `LO`
           )->column( mergeduplicates = `{LO>MERGE}` visible = `{LO>VISIBLE}` )->get_parent(
         )->get_parent( )->get_parent(
         )->items(
           )->column_list_item(
             )->cells(
-              )->template_repeat( list = `{/MT_LAYOUT}` var = `LO2`
+              )->template_repeat( list = `{template>/MT_LAYOUT}` var = `LO2`
                 )->object_identifier( text = `{= '{' + ${LO2>FNAME} + '}' }` ).
 
     i_client->nest_view_display( val = lo_view_nested->stringify( ) id = `test` method_insert = 'addContent' ).