diff --git a/src/z2ui5_cl_demo_app_000.clas.abap b/src/z2ui5_cl_demo_app_000.clas.abap
index 180ec841..2abdd5f4 100644
--- a/src/z2ui5_cl_demo_app_000.clas.abap
+++ b/src/z2ui5_cl_demo_app_000.clas.abap
@@ -1285,7 +1285,7 @@ CLASS z2ui5_cl_demo_app_000 IMPLEMENTATION.
 
         panel->generic_tile(
                header    = 'Popup to Select'
-               press     =  client->_event( 'Z2UI5_CL_DEMO_APP_152' )
+               press     =  client->_event( 'z2ui5_cl_demo_app_174' )
                mode      = 'LineMode'
                class     = 'sapUiTinyMarginEnd sapUiTinyMarginBottom'
            ).
diff --git a/src/z2ui5_cl_demo_app_187.clas.abap b/src/z2ui5_cl_demo_app_187.clas.abap
index 98b4d15b..658a4c83 100644
--- a/src/z2ui5_cl_demo_app_187.clas.abap
+++ b/src/z2ui5_cl_demo_app_187.clas.abap
@@ -34,15 +34,16 @@ CLASS z2ui5_cl_demo_app_187 IMPLEMENTATION.
     CASE client->get( )-event.
 
       WHEN 'SY'.
-        MESSAGE ID 'NET' TYPE 'I' NUMBER '001' INTO DATA(lv_dummy).
+        MESSAGE ID 'NET' TYPE 'E' NUMBER '001' INTO DATA(lv_dummy).
         client->message_box_display( sy ).
 
       WHEN 'BAPIRET'.
         DATA ls_msg TYPE bapiret2.
+
 *        CALL FUNCTION 'BAPI_TRANSACTION_COMMIT'
 *          IMPORTING
 *            return = ls_msg.
-         ls_msg = value #( id = 'NET' number = '001' ).
+        ls_msg = VALUE #( id = 'NET' number = '001' ).
         client->message_box_display( ls_msg ).
 
       WHEN 'CX_ROOT'.
@@ -52,8 +53,10 @@ CLASS z2ui5_cl_demo_app_187 IMPLEMENTATION.
             client->message_box_display( lx ).
         ENDTRY.
 
-    ENDCASE.
+      WHEN 'BACK'.
+        client->nav_app_leave( ).
 
+    ENDCASE.
 
   ENDMETHOD.
 ENDCLASS.