diff --git a/src/z2ui5_cl_demo_app_335.clas.abap b/src/z2ui5_cl_demo_app_335.clas.abap
index ce94cff5..e43508c6 100644
--- a/src/z2ui5_cl_demo_app_335.clas.abap
+++ b/src/z2ui5_cl_demo_app_335.clas.abap
@@ -24,6 +24,8 @@ CLASS z2ui5_cl_demo_app_335 IMPLEMENTATION.
 
   METHOD z2ui5_if_app~main.
 
+    FIELD-SYMBOLS <row> TYPE z2ui5_t_01.
+
     IF client->check_on_init( ).
 
       get_data( ).
@@ -49,8 +51,8 @@ CLASS z2ui5_cl_demo_app_335 IMPLEMENTATION.
 
     ENDCASE.
 
-    IF client->get( )-check_on_navigated = abap_true
-        AND client->check_on_init( )          = abap_false.
+    IF     client->get( )-check_on_navigated = abap_true
+       AND client->check_on_init( )          = abap_false.
       ui5_view_display( client ).
     ENDIF.
 
@@ -66,6 +68,18 @@ CLASS z2ui5_cl_demo_app_335 IMPLEMENTATION.
       client->message_toast_display( 'ERROR - mo_layout_obj_2->mr_data  is not bound!' ).
     ENDIF.
 
+    ASSIGN mo_layout_obj_2->mr_data->* TO <row>.
+
+    IF <row>-id <> ms_struc-id.
+      client->message_toast_display( 'ERROR - mo_layout_obj_2->mr_data->id  does not match ms_struc-id!' ).
+    ENDIF.
+
+    ASSIGN mo_layout_obj->mr_data->* TO <row>.
+
+    IF <row>-id <> ms_struc-id.
+      client->message_toast_display( 'ERROR - mo_layout_obj->mr_data->id  does not match ms_struc-id!' ).
+    ENDIF.
+
     client->view_model_update( ).
 
   ENDMETHOD.