diff --git a/src/00/z2ui5_cl_fw_db.clas.abap b/src/00/z2ui5_cl_fw_db.clas.abap
index 1f744bcb..81446952 100644
--- a/src/00/z2ui5_cl_fw_db.clas.abap
+++ b/src/00/z2ui5_cl_fw_db.clas.abap
@@ -68,6 +68,7 @@ CLASS z2ui5_cl_fw_db IMPLEMENTATION.
 
   METHOD create.
 
+    db-app->id = id.
     DATA(lv_xml) = trans_any_2_xml( db ).
 
     DATA(ls_draft) = VALUE z2ui5_t_draft( uuid                = id
diff --git a/src/00/z2ui5_cl_fw_handler.clas.abap b/src/00/z2ui5_cl_fw_handler.clas.abap
index 745aaaa2..ff9aed60 100644
--- a/src/00/z2ui5_cl_fw_handler.clas.abap
+++ b/src/00/z2ui5_cl_fw_handler.clas.abap
@@ -149,6 +149,12 @@ CLASS z2ui5_cl_fw_handler IMPLEMENTATION.
     r_result->ms_actual-check_on_navigated = abap_true.
     r_result->ms_next-s_set     = ms_next-s_set.
 
+    TRY.
+        DATA(ls_db_next) = z2ui5_cl_fw_db=>load_app( id = app->id ).
+        r_result->ms_db-t_attri = ls_db_next-t_attri.
+      CATCH cx_root.
+    ENDTRY.
+
   ENDMETHOD.
 
   METHOD request_begin.
@@ -306,7 +312,7 @@ CLASS z2ui5_cl_fw_handler IMPLEMENTATION.
     result->ms_db-id      = z2ui5_cl_fw_utility=>func_get_uuid_32( ).
     result->ms_db-id_prev = id_prev.
 
-       TRY.
+    TRY.
         result->ms_actual-viewname = so_body->get_attribute( `VIEWNAME` )->get_val( ).
       CATCH cx_root.
     ENDTRY.
@@ -342,7 +348,7 @@ CLASS z2ui5_cl_fw_handler IMPLEMENTATION.
       z2ui5_cl_fw_db=>create( id = ms_db-id db = ms_db ).
     ENDIF.
 
-    CLEAR result->ms_db-t_attri.
+*    CLEAR result->ms_db-t_attri.
 
   ENDMETHOD.