diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index 26748190..5b4385a3 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -84,19 +84,6 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            |\n|  &&
                            `            onAfterRendering: function () {` && |\n|  &&
                            |\n|  &&
-                           `                if (sap.z2ui5.oResponse.PARAMS.TITLE != "") {` && |\n|  &&
-                           `                    document.title = sap.z2ui5.oResponse.PARAMS.TITLE;` && |\n|  &&
-                           `                }` && |\n|  &&
-                           `                if (sap.z2ui5.oResponse.PARAMS.S_MSG_TOAST.TEXT !== '') {` && |\n|  &&
-                           `                    sap.m.MessageToast.show(sap.z2ui5.oResponse.PARAMS.S_MSG_TOAST.TEXT);` && |\n|  &&
-                           `                }` && |\n|  &&
-                           `                if (sap.z2ui5.oResponse.PARAMS.S_MSG_BOX.TEXT !== '') {` && |\n|  &&
-                           `                    sap.m.MessageBox[sap.z2ui5.oResponse.PARAMS.S_MSG_BOX.TYPE](sap.z2ui5.oResponse.PARAMS.S_MSG_BOX.TEXT);` && |\n|  &&
-                           `                }` && |\n|  &&
-                           `                if (sap.z2ui5.oResponse.SEARCH != "") {` && |\n|  &&
-                           `                 history.replaceState(null, null, sap.z2ui5.oResponse.SEARCH );` && |\n|  &&
-                           `                    //    window.history.replaceState("", "", window.location.origin + sap.z2ui5.oResponse.PARAMS.PATH + window.location.search);` && |\n|  &&
-                           `                }` && |\n|  &&
                            `                if (sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID !== '') {` && |\n|  &&
                            `                    jQuery.sap.delayedCall(50, this, () => {` && |\n|  &&
                            `                        var ofocus = sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID).getFocusInfo();` && |\n|  &&
@@ -331,6 +318,19 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `                    if (sap.z2ui5.oResponse.PARAMS.S_POPUP.CHECK_UPDATE_MODEL == true) { sap.z2ui5.oViewPopup.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL)); }` && |\n|  &&
                            `                    if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.CHECK_UPDATE_MODEL == true) { sap.z2ui5.oViewPopover.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL)); }` && |\n|  &&
                            `                    sap.z2ui5.oController.onAfterRendering();` && |\n|  &&
+                           `                }` && |\n|  &&
+                                                      `                if (sap.z2ui5.oResponse.PARAMS.TITLE != "") {` && |\n|  &&
+                           `                    document.title = sap.z2ui5.oResponse.PARAMS.TITLE;` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_MSG_TOAST.TEXT !== '') {` && |\n|  &&
+                           `                    sap.m.MessageToast.show(sap.z2ui5.oResponse.PARAMS.S_MSG_TOAST.TEXT);` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_MSG_BOX.TEXT !== '') {` && |\n|  &&
+                           `                    sap.m.MessageBox[sap.z2ui5.oResponse.PARAMS.S_MSG_BOX.TYPE](sap.z2ui5.oResponse.PARAMS.S_MSG_BOX.TEXT);` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.SEARCH != "") {` && |\n|  &&
+                           `                 history.replaceState(null, null, sap.z2ui5.oResponse.SEARCH );` && |\n|  &&
+                           `                    //    window.history.replaceState("", "", window.location.origin + sap.z2ui5.oResponse.PARAMS.PATH + window.location.search);` && |\n|  &&
                            `                }` && |\n|  &&
                            `            },` && |\n|  &&
                            `            readHttp: () => {` && |\n|  &&
diff --git a/src/z2ui5_cl_xml_view.clas.abap b/src/z2ui5_cl_xml_view.clas.abap
index 8e731367..b989108d 100644
--- a/src/z2ui5_cl_xml_view.clas.abap
+++ b/src/z2ui5_cl_xml_view.clas.abap
@@ -1258,7 +1258,8 @@ public section.
 ENDCLASS.
 
 
-CLASS z2ui5_cl_xml_view IMPLEMENTATION.
+
+CLASS Z2UI5_CL_XML_VIEW IMPLEMENTATION.
 
 
   METHOD actions.
@@ -1299,6 +1300,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
     result = _generic( name = `Bar` ).
   ENDMETHOD.
 
+
   METHOD begin_column_pages.
     " todo, implement method
     result = _generic( name = `beginColumnPages`
@@ -2739,6 +2741,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
                                 ( n = `selected`    v = selected ) ) ).
   ENDMETHOD.
 
+
   METHOD step_input.
     result = me.
     _generic( name   = `StepInput`
@@ -3143,6 +3146,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
   ENDMETHOD.
 
+
   METHOD tree.
     result = _generic( name   = `Tree`
                        t_prop = VALUE #(
@@ -3169,5 +3173,4 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
                                 ( n = `selected`    v = selected ) ) ).
 
   ENDMETHOD.
-
 ENDCLASS.