diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index aa505183..7753cb69 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -75,282 +75,282 @@ CLASS z2ui5_cl_http_handler IMPLEMENTATION.
         `    <div id="content"  data-handle-validation="true" ></div>` && |\n| &&
         `</body>` && |\n| &&
         `</html>` && |\n|.
-    r_result = r_result && `<abc/>` && |\n| &&
-                           `<script id="z2ui5">` && |\n| &&
-                           `    sap.ui.getCore().attachInit(function () {` && |\n| &&
-                           `        "use strict";` && |\n| &&
-                           |\n| &&
-                           `        sap.ui.controller("z2ui5_controller", {` && |\n| &&
-                           |\n| &&
-                           `            onAfterRendering: function () {` && |\n| &&
-                           `                sap.z2ui5.onAfter();` && |\n| &&
-                           `            },` && |\n| &&
-                           `            onEventFrontend: function (oEvent) {` && |\n| &&
-                           |\n| &&
-                           `                switch (oEvent.EVENT) {` && |\n| &&
-                           |\n| &&
-                           `                    case 'LEAVE_HOME':` && |\n| &&
-                           `                      if(sap.z2ui5.oResponse.PARAMS.PATH != '' ){` && |\n| &&
-                           `                       window.location = window.location.href.split( sap.z2ui5.oResponse.PARAMS.PATH )[ 0 ];` && |\n| &&
-                           `                        } else {  window.location.reload(); } break;` && |\n| &&
-                            `                    case 'LEAVE_RESTART':` && |\n| &&
-                           `                       window.location.reload();` && |\n| &&
-                           `                        break;` && |\n| &&
-                           `                    case 'POPUP_CLOSE':` && |\n| &&
-                           `                        if (sap.z2ui5.oViewPopup.close) {` && |\n| &&
-                           `                            sap.z2ui5.oViewPopup.close();` && |\n| &&
-                           `                        }` && |\n| &&
-                           `                        sap.z2ui5.oViewPopup.destroy();` && |\n| &&
-                           `                        delete sap.z2ui5.oViewPopup;` && |\n| &&
-                           `                        break;` && |\n| &&
-                           `                    case 'POPOVER_CLOSE':` && |\n| &&
-                           `                        if (sap.z2ui5.oViewPopover.close) {` && |\n| &&
-                           `                            sap.z2ui5.oViewPopover.close();` && |\n| &&
-                           `                        }` && |\n| &&
-                           `                        sap.z2ui5.oViewPopover.destroy();` && |\n| &&
-                           `                        delete sap.z2ui5.oViewPopover;` && |\n| &&
-                           `                        break;` && |\n| &&
-                           `                }` && |\n| &&
-                           `            },` && |\n| &&
-                           |\n| &&
-                           `        onEvent: function (oEvent) {` && |\n| &&
-                           |\n| &&
-                           `            if (!window.navigator.onLine) {` && |\n| &&
-                           `                sap.m.MessageBox.alert('No internet connection! Please reconnect to the server and try again.');` && |\n| &&
-                           `                return;` && |\n| &&
-                           `            }` && |\n| &&
-                           `            sap.ui.core.BusyIndicator.show();` && |\n| &&
-                           `            this.oBody = {};` && |\n| &&
-                           `            this.oBody.oUpdate = sap.z2ui5.oView.getModel().oData.oUpdate;` && |\n| &&
-                           |\n| &&
-                           `            if (sap.z2ui5.oResponse.PARAMS.T_SCROLL) {` && |\n| &&
-                           `                this.oBody.oScroll = sap.z2ui5.oResponse.PARAMS.T_SCROLL;` && |\n| &&
-                           `                this.oBody.oScroll.forEach(item => {` && |\n| &&
-                           `                    try {` && |\n| &&
-                           `                        item.VALUE = this.getView().byId(item.NAME).getScrollDelegate().getScrollTop();` && |\n| &&
-                           `                    } catch (e) {` && |\n| &&
-                           `                        try {` && |\n| &&
-                           `                            var ele = '#' + this.getView().byId(item.NAME).getId() + '-inner';` && |\n| &&
-                           `                            item.VALUE = $(ele).scrollTop();` && |\n| &&
-                           `                        } catch (e) { }` && |\n| &&
-                           `                    }` && |\n| &&
-                           `                });` && |\n| &&
-                           `            }` && |\n| &&
-                           `            this.oBody.ID = sap.z2ui5.oResponse.ID;` && |\n| &&
-                           `            this.oBody.CHECKLAUNCHPADACTIVE = false;` && |\n| &&
-                           `            if (sap.z2ui5.checkLaunchpadActive) {` && |\n| &&
-                           `                if (sap.z2ui5.checkLaunchpadActive == true) {` && |\n| &&
-                           `                    this.oBody.CHECKLAUNCHPADACTIVE = true;` && |\n| &&
-                           `                }` && |\n| &&
-                           `            }` && |\n| &&
-                           `            this.oBody.ARGUMENTS = arguments;` && |\n| &&
-                           `            try { this.oBody.OCURSOR = sap.ui.getCore().byId(sap.ui.getCore().getCurrentFocusedControlId()).getFocusInfo(); } catch (e) { }` && |\n| &&
-                           |\n| &&
-                           `            if (sap.z2ui5.checkLogActive) {` && |\n| &&
-                           `                console.log('Request Object:');` && |\n| &&
-                           `                console.log(this.oBody);` && |\n| &&
-                           `            }` && |\n| &&
-                           `            sap.z2ui5.oResponseOld = sap.z2ui5.oResponse;` && |\n| &&
-                           `            sap.z2ui5.oResponse = {};` && |\n| &&
-                           `            sap.z2ui5.oBody = this.oBody;` && |\n| &&
-                           `            sap.z2ui5.isHoldView = oEvent.isHoldView;` && |\n| &&
-                           `            sap.z2ui5.Roundtrip(oEvent.isHoldView);` && |\n| &&
-                           `        },` && |\n| &&
-                           |\n| &&
-                           `        responseError: function (response) {` && |\n| &&
-                           `            document.write(response);` && |\n| &&
-                           `        },` && |\n| &&
-                           |\n| &&
-                           `        responseSuccess: function (response) {` && |\n| &&
-                           |\n| &&
-                           `            sap.z2ui5.oResponse = JSON.parse(response);` && |\n| &&
-                           |\n| &&
-                           `            if (sap.z2ui5.checkLogActive) {` && |\n| &&
-                           `                console.log('Response Object:');` && |\n| &&
-                           `                console.log(sap.z2ui5.oResponse);` && |\n| &&
-                           `                if (sap.z2ui5.oResponse.PARAMS.S_VIEW.XML !== '') {` && |\n| &&
-                           `                    console.log('UI5-XML-View:');` && |\n| &&
-                           `                    console.log(sap.z2ui5.oResponse.PARAMS.S_VIEW.XML);` && |\n| &&
-                           `                }` && |\n| &&
-                           `                if (sap.z2ui5.oResponse.PARAMS.S_POPUP.XML !== '') {` && |\n| &&
-                           `                    console.log('UI5-XML-Popup:');` && |\n| &&
-                           `                    console.log(sap.z2ui5.oResponse.PARAMS.S_POPUP.XML);` && |\n| &&
-                           `                }` && |\n| &&
-                           `            }` && |\n| &&
-                           |\n| &&
-                     `                    var oModel = new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL);` && |\n| &&
-`            if (sap.z2ui5.oResponse.PARAMS.S_VIEW.CHECK_DESTROY == true) { if (sap.z2ui5.oView) { sap.z2ui5.oView.destroy( );  }  }` && |\n| &&
-`            if (sap.z2ui5.oResponse.PARAMS.S_VIEW.XML !== '') {` && |\n| &&
-                          `            if (sap.z2ui5.oView) { sap.z2ui5.oView.destroy( ); delete sap.z2ui5.oView; }` && |\n| &&
-                           `            var oView = new sap.ui.core.mvc.XMLView.create({` && |\n| &&
-                           `                definition: sap.z2ui5.oResponse.PARAMS.S_VIEW.XML,` && |\n| &&
-                           `            }).then(oView => {` && |\n| &&
-                           `                oView.setModel(oModel);` && |\n| &&
-                           `                if (sap.z2ui5.oParent) {` && |\n| &&
-                           `                    sap.z2ui5.oParent.removeAllPages();` && |\n| &&
-                           `                    sap.z2ui5.oParent.insertPage(oView);` && |\n| &&
-                           `                } else {` && |\n| &&
-                           `                    oView.placeAt("content")` && |\n| &&
-                           `                };` && |\n| &&
-                           `                sap.z2ui5.oView = oView;` && |\n| &&
-                           `            },` && |\n| &&
-                           `            ); }else{  if (sap.z2ui5.oView ) { sap.z2ui5.oView.setModel(oModel); }  sap.z2ui5.onAfter(); }` && |\n| &&
-                           `        },` && |\n| &&
-                           |\n| &&
-                           `        readHttp: function () {` && |\n| &&
-                           |\n| &&
-                           `            var xhr = new XMLHttpRequest();` && |\n| &&
-                           `            xhr.open("POST", sap.z2ui5.pathname, true);` && |\n| &&
-                           `            xhr.onload = function (that) {` && |\n| &&
-                           |\n| &&
-                           `                if (that.target.status !== 200) {` && |\n| &&
-                           `                    sap.z2ui5.oController.responseError(that.target.response);` && |\n| &&
-                           `                } else {` && |\n| &&
-                           `                    sap.z2ui5.oController.responseSuccess(that.target.response);` && |\n| &&
-                           `                }` && |\n| &&
-                           `            }` && |\n| &&
-                           `            xhr.send(JSON.stringify(sap.z2ui5.oBody));` && |\n| &&
-                           `        },` && |\n| &&
-                           |\n| &&
-                           `        Roundtrip: function (isHoldView) {` && |\n| &&
-                           `            sap.z2ui5.checkTimerActive = false;` && |\n| &&
-                           `            if (!sap.z2ui5.oBody) { sap.z2ui5.oBody = {}; };` && |\n| &&
-                           `            sap.z2ui5.oBody.OLOCATION = {};` && |\n| &&
-                           `            sap.z2ui5.oBody.OLOCATION.ORIGIN = window.location.origin;` && |\n| &&
-                           `            sap.z2ui5.oBody.OLOCATION.PATHNAME = sap.z2ui5.pathname;` && |\n| &&
-                           `            sap.z2ui5.oBody.OLOCATION.SEARCH = window.location.search;` && |\n| &&
-                           `            sap.z2ui5.oBody.OLOCATION.VERSION = sap.ui.getVersionInfo().gav;` && |\n| &&
-                           |\n| &&
-                           `            if (sap.z2ui5.readOData) {` && |\n| &&
-                           `                sap.z2ui5.readOData();` && |\n| &&
-                           `            } else {` && |\n| &&
-                           `                oView.getController().readHttp();` && |\n| &&
-                           `            }` && |\n| &&
-                           `        },` && |\n| &&
-                           `        });` && |\n| &&
-                           |\n| &&
-                           `    if (!sap.z2ui5) {` && |\n| &&
-                           `        sap.z2ui5 = {};` && |\n| &&
-                           `    }` && |\n| &&
-                           `    if (!sap.z2ui5.pathname) {` && |\n| &&
-                           `        sap.z2ui5.pathname = window.location.pathname;` && |\n| &&
-*                           `        sap.z2ui5.pathname = '/sap/bc/http/sap/y2ui5_http_handler';` && |\n|  &&
-                           `    }` && |\n| &&
-                           `    var xml = atob('PA==') + 'mvc:View controllerName="z2ui5_controller" xmlns:mvc="sap.ui.core.mvc" /' + atob('Pg==');` && |\n| &&
-                           `    jQuery.sap.require("sap.ui.core.Fragment");` && |\n| &&
-                           `    jQuery.sap.require("sap.m.MessageToast");` && |\n| &&
-                           `    jQuery.sap.require("sap.m.MessageBox");` && |\n| &&
-                           `    jQuery.sap.require("sap.ui.model.json.JSONModel");` && |\n| &&
-                           `    var oView = sap.ui.xmlview({ viewContent: xml });` && |\n| &&
-                           `    sap.z2ui5.Roundtrip = oView.getController().Roundtrip;` && |\n| &&
-                           `    sap.z2ui5.oController = oView.getController();` && |\n| &&
-                           `    sap.z2ui5.Roundtrip(false);` && |\n| &&
-                           `    sap.z2ui5.onAfter = () => {` && |\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| &&
-                           `       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| &&
-                           `        if (sap.z2ui5.oResponse.PARAMS.PATH != "") {` && |\n| &&
-                           `            //    window.history.replaceState("", "", window.location.origin + sap.z2ui5.oResponse.PARAMS.PATH + window.location.search);` && |\n| &&
-                           `        }` && |\n| &&
-                           `        var oView = sap.z2ui5.oView;` && |\n| &&
-                           `        try {` && |\n| &&
-                           `            if (sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID !== '') {` && |\n| &&
-                           `                jQuery.sap.delayedCall(50, this, function () {` && |\n| &&
-                           `                    var ofocus = sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID).getFocusInfo();` && |\n| &&
-                           `                    ofocus.selectionStart = parseInt(sap.z2ui5.oResponse.PARAMS.S_CURSOR.SELECTIONSTART);` && |\n| &&
-                           `                    ofocus.selectionEnd = parseInt(sap.z2ui5.oResponse.PARAMS.S_CURSOR.SELECTIONEND);` && |\n| &&
-                           `                    sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID).applyFocusInfo(ofocus);` && |\n| &&
-                           `                });` && |\n| &&
-                           `            }` && |\n| &&
-                           `        } catch (error) { }` && |\n| &&
-                           `        ; try { } catch (error) { }` && |\n| &&
-                           `        ; if (sap.z2ui5.oResponse.PARAMS.T_SCROLL) {` && |\n| &&
-                           `            sap.z2ui5.oResponse.PARAMS.T_SCROLL.forEach(item => {` && |\n| &&
-                           `                try {` && |\n| &&
-                           `                    oView.byId(item.NAME).scrollTo(parseInt(item.VALUE));` && |\n| &&
-                           `                } catch (e) {` && |\n| &&
-                           `                    try {` && |\n| &&
-                           `                        var ele = '#' + oView.byId(item.NAME).getId() + '-inner';` && |\n| &&
-                           `                        $(ele).scrollTop(item.VALUE);` && |\n| &&
-                           `                    } catch (e) { }` && |\n| &&
-                           `                }` && |\n| &&
-                           `            }` && |\n| &&
-                           `            );` && |\n| &&
-                           `        }` && |\n| &&
-                           `        if (sap.z2ui5.oResponse.PARAMS.S_POPUP.XML) {` && |\n| &&
-                           `   if(sap.z2ui5.oViewPopup) { sap.z2ui5.oViewPopup.destroy( );  delete sap.z2ui5.oViewPopup; }` && |\n| &&
-                           `            sap.ui.core.Fragment.load({` && |\n| &&
-                           `                definition: sap.z2ui5.oResponse.PARAMS.S_POPUP.XML,` && |\n| &&
-                           `                controller: sap.z2ui5.oController,` && |\n| &&
-                           `            }).then(function (oFragment) {` && |\n| &&
-                           `                oFragment.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL))` && |\n| &&
-                           `                sap.z2ui5.oView.addDependent(oFragment);` && |\n| &&
-                           `                    oFragment.open();` && |\n| &&
-                           `                sap.z2ui5.oViewPopup = oFragment;` && |\n| &&
-                           `                sap.ui.core.BusyIndicator.hide();` && |\n| &&
-                           `            }` && |\n| &&
-                           `                .bind(this));` && |\n| &&
-                           `        } else if (sap.z2ui5.oResponse.PARAMS.S_POPUP.CHECK_CLOSE == true) {` && |\n| &&
-                           |\n| &&
-                           `            if (sap.z2ui5.oViewPopup.close) {` && |\n| &&
-                           `               try { sap.z2ui5.oViewPopup.close(); } catch (e) { }` && |\n| &&
-                           `            }` && |\n| &&
-                           `            sap.z2ui5.oViewPopup.destroy();` && |\n| &&
-                           `            delete sap.z2ui5.oViewPopup;` && |\n| &&
-                           |\n| &&
-                           `        }` && |\n| &&
-                           |\n| &&
-                           `        if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.XML) {` && |\n| &&
-                           `   if(sap.z2ui5.oViewPopover) { sap.z2ui5.oViewPopover.destroy( );  delete sap.z2ui5.oViewPopover; }` && |\n| &&
-                           `            sap.ui.core.Fragment.load({` && |\n| &&
-                           `                definition: sap.z2ui5.oResponse.PARAMS.S_POPOVER.XML,` && |\n| &&
-                           `                controller: sap.z2ui5.oController,` && |\n| &&
-                           `            }).then(function (oFragment) {` && |\n| &&
-                           `                oFragment.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL))` && |\n| &&
-                           `                sap.z2ui5.oView.addDependent(oFragment);` && |\n| &&
-                           |\n| &&
-                           `                var oControl = sap.ui.getCore().byId(sap.z2ui5.oResponse.PARAMS.S_POPOVER.OPEN_BY_ID);` && |\n| &&
-                           `                if (oControl === undefined) {` && |\n| &&
-                           `                    oControl = sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_POPOVER.OPEN_BY_ID);` && |\n| &&
-                           `                }` && |\n| &&
-                           `                oFragment.openBy(oControl);` && |\n| &&
-                           |\n| &&
-                           `                sap.z2ui5.oViewPopover = oFragment;` && |\n| &&
-                           `                sap.ui.core.BusyIndicator.hide();` && |\n| &&
-                           `            }` && |\n| &&
-                           `                .bind(this));` && |\n| &&
-                           `        } else if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.CHECK_CLOSE == true) {` && |\n| &&
-                           |\n| &&
-                           `            if (sap.z2ui5.oViewPopover.close) {` && |\n| &&
-                           `                sap.z2ui5.oViewPopover.close();` && |\n| &&
-                           `            }` && |\n| &&
-                           `            sap.z2ui5.oViewPopover.destroy();` && |\n| &&
-                           `            delete sap.z2ui5.oViewPopover;` && |\n| &&
-                           |\n| &&
-                           `        }` && |\n| &&
-                           |\n| &&
-                           `        if (sap.z2ui5.oResponse.PARAMS.S_TIMER.INTERVAL_MS !== '') {` && |\n| &&
-                           `            var oEvent = { 'EVENT': 'BUTTON_CHECK', 'METHOD': 'UPDATE' };` && |\n| &&
-                           `            oEvent.EVENT = sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED;` && |\n| &&
-                           `            sap.z2ui5.checkTimerActive = true;` && |\n| &&
-                           `            setTimeout(() => {` && |\n| &&
-                           `                if (sap.z2ui5.checkTimerActive) {` && |\n| &&
-                           `                    sap.z2ui5.oController.onEvent(oEvent);` && |\n| &&
-                           `                }` && |\n| &&
-                           `            }, parseInt(sap.z2ui5.oResponse.PARAMS.S_TIMER.INTERVAL_MS), oEvent);` && |\n| &&
-                           `        }` && |\n| &&
-                           `        sap.ui.core.BusyIndicator.hide();` && |\n| &&
-                           `    };` && |\n| &&
-                          `  sap.z2ui5.checkLogActive = ` && z2ui5_lcl_utility=>get_json_boolean( check_logging ) && `;` && |\n| &&
-                           `    });` && |\n| &&
+    r_result = r_result && `<script>` && |\n|  &&
+                           `    sap.ui.getCore().attachInit(function () {` && |\n|  &&
+                           `        "use strict";` && |\n|  &&
+                           |\n|  &&
+                           `        sap.ui.controller("z2ui5_controller", {` && |\n|  &&
+                           |\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.PARAMS.PATH != "") {` && |\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, function () {` && |\n|  &&
+                           `                        var ofocus = sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID).getFocusInfo();` && |\n|  &&
+                           `                        ofocus.selectionStart = parseInt(sap.z2ui5.oResponse.PARAMS.S_CURSOR.SELECTIONSTART);` && |\n|  &&
+                           `                        ofocus.selectionEnd = parseInt(sap.z2ui5.oResponse.PARAMS.S_CURSOR.SELECTIONEND);` && |\n|  &&
+                           `                        sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_CURSOR.ID).applyFocusInfo(ofocus);` && |\n|  &&
+                           `                    });` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.T_SCROLL) {` && |\n|  &&
+                           `                    sap.z2ui5.oResponse.PARAMS.T_SCROLL.forEach(item => {` && |\n|  &&
+                           `                        try {` && |\n|  &&
+                           `                            sap.z2ui5.oView.byId(item.NAME).scrollTo(parseInt(item.VALUE));` && |\n|  &&
+                           `                        } catch (e) {` && |\n|  &&
+                           `                            try {` && |\n|  &&
+                           `                                var ele = '#' + sap.z2ui5.oView.byId(item.NAME).getId() + '-inner';` && |\n|  &&
+                           `                                $(ele).scrollTop(item.VALUE);` && |\n|  &&
+                           `                            } catch (e) { }` && |\n|  &&
+                           `                        }` && |\n|  &&
+                           `                    }` && |\n|  &&
+                           `                    );` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_POPUP.CHECK_CLOSE == true) {` && |\n|  &&
+                           `                    sap.z2ui5.oController.PopupClose();` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_POPUP.XML) {` && |\n|  &&
+                           `                    sap.z2ui5.oController.PopupClose();` && |\n|  &&
+                           `                    sap.ui.core.Fragment.load({` && |\n|  &&
+                           `                        definition: sap.z2ui5.oResponse.PARAMS.S_POPUP.XML,` && |\n|  &&
+                           `                        controller: sap.z2ui5.oController,` && |\n|  &&
+                           `                    }).then(function (oFragment) {` && |\n|  &&
+                           `                        oFragment.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL))` && |\n|  &&
+                           `                        sap.z2ui5.oView.addDependent(oFragment);` && |\n|  &&
+                           `                        oFragment.open();` && |\n|  &&
+                           `                        sap.z2ui5.oViewPopup = oFragment;` && |\n|  &&
+                           `                    }.bind(this));` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.CHECK_CLOSE == true) {` && |\n|  &&
+                           `                    sap.z2ui5.oController.PopoverClose();` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_POPOVER.XML) {` && |\n|  &&
+                           `                    sap.z2ui5.oController.PopoverClose();` && |\n|  &&
+                           `                    sap.ui.core.Fragment.load({` && |\n|  &&
+                           `                        definition: sap.z2ui5.oResponse.PARAMS.S_POPOVER.XML,` && |\n|  &&
+                           `                        controller: sap.z2ui5.oController,` && |\n|  &&
+                           `                    }).then(function (oFragment) {` && |\n|  &&
+                           `                        oFragment.setModel(new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL))` && |\n|  &&
+                           `                        sap.z2ui5.oView.addDependent(oFragment);` && |\n|  &&
+                           `                        var oControl = sap.ui.getCore().byId(sap.z2ui5.oResponse.PARAMS.S_POPOVER.OPEN_BY_ID);` && |\n|  &&
+                           `                        if (oControl === undefined) {` && |\n|  &&
+                           `                            oControl = sap.z2ui5.oView.byId(sap.z2ui5.oResponse.PARAMS.S_POPOVER.OPEN_BY_ID);` && |\n|  &&
+                           `                        }` && |\n|  &&
+                           `                        oFragment.openBy(oControl);` && |\n|  &&
+                           `                        sap.z2ui5.oViewPopover = oFragment;` && |\n|  &&
+                           `                    }.bind(this));` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_TIMER.INTERVAL_MS !== '') {` && |\n|  &&
+                           `                    var oEvent = { 'EVENT': 'BUTTON_CHECK', 'METHOD': 'UPDATE' };` && |\n|  &&
+                           `                    oEvent.EVENT = sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED;` && |\n|  &&
+                           `                    sap.z2ui5.checkTimerActive = true;` && |\n|  &&
+                           `                    setTimeout(() => {` && |\n|  &&
+                           `                        if (sap.z2ui5.checkTimerActive) {` && |\n|  &&
+                           `                            sap.z2ui5.oController.onEvent(oEvent);` && |\n|  &&
+                           `                        }` && |\n|  &&
+                           `                    }, parseInt(sap.z2ui5.oResponse.PARAMS.S_TIMER.INTERVAL_MS), oEvent);` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                sap.ui.core.BusyIndicator.hide();` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            PopupClose: function () {` && |\n|  &&
+                           `                if (!sap.z2ui5.oViewPopup) {` && |\n|  &&
+                           `                    return;` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oViewPopup.close) {` && |\n|  &&
+                           `                    try { sap.z2ui5.oViewPopup.close(); } catch (e) { }` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                sap.z2ui5.oViewPopup.destroy();` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            PopoverClose: function () {` && |\n|  &&
+                           `                if (!sap.z2ui5.oViewPopover) {` && |\n|  &&
+                           `                    return;` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oViewPopover.close) {` && |\n|  &&
+                           `                    try { sap.z2ui5.oViewPopover.close(); } catch (e) { }` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                sap.z2ui5.oViewPopover.destroy();` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            ViewClose: function () {` && |\n|  &&
+                           `                if (!sap.z2ui5.oView) {` && |\n|  &&
+                           `                    return;` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                sap.z2ui5.oView.destroy();` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            onEventFrontend: function (oEvent) {` && |\n|  &&
+                           |\n|  &&
+                           `                switch (oEvent.EVENT) {` && |\n|  &&
+                           |\n|  &&
+                           `                    case 'LEAVE_HOME':` && |\n|  &&
+                           `                        if (sap.z2ui5.oResponse.PARAMS.PATH != '') {` && |\n|  &&
+                           `                            window.location = window.location.href.split(sap.z2ui5.oResponse.PARAMS.PATH)[0];` && |\n|  &&
+                           `                        } else { window.location.reload(); }` && |\n|  &&
+                           `                        break;` && |\n|  &&
+                           `                    case 'LEAVE_RESTART':` && |\n|  &&
+                           `                        window.location.reload();` && |\n|  &&
+                           `                        break;` && |\n|  &&
+                           `                    case 'POPUP_CLOSE':` && |\n|  &&
+                           `                        sap.z2ui5.oController.PopupClose();` && |\n|  &&
+                           `                        break;` && |\n|  &&
+                           `                    case 'POPOVER_CLOSE':` && |\n|  &&
+                           `                        sap.z2ui5.oController.PopoverClose();` && |\n|  &&
+                           `                        break;` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            onEventPromise: function (Promise) {` && |\n|  &&
+                           `               ` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            onEvent: function (oEvent) {` && |\n|  &&
+                           |\n|  &&
+                           `                if (!window.navigator.onLine) {` && |\n|  &&
+                           `                    sap.m.MessageBox.alert('No internet connection! Please reconnect to the server and try again.');` && |\n|  &&
+                           `                    return;` && |\n|  &&
+                           `                }` && |\n|  &&
+                           |\n|  &&
+                           `                sap.ui.core.BusyIndicator.show();` && |\n|  &&
+                           `                this.oBody = {};` && |\n|  &&
+                           `                this.oBody.oUpdate = sap.z2ui5.oView.getModel().getData().oUpdate;` && |\n|  &&
+                           `                if (oEvent.CHECK_VIEW_DESTROY) {` && |\n|  &&
+                           `                    sap.z2ui5.oController.ViewClose();` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.T_SCROLL) {` && |\n|  &&
+                           `                    this.oBody.oScroll = sap.z2ui5.oResponse.PARAMS.T_SCROLL;` && |\n|  &&
+                           `                    this.oBody.oScroll.forEach(item => {` && |\n|  &&
+                           `                        try {` && |\n|  &&
+                           `                            item.VALUE = this.getView().byId(item.NAME).getScrollDelegate().getScrollTop();` && |\n|  &&
+                           `                        } catch (e) {` && |\n|  &&
+                           `                            try {` && |\n|  &&
+                           `                                var ele = '#' + this.getView().byId(item.NAME).getId() + '-inner';` && |\n|  &&
+                           `                                item.VALUE = $(ele).scrollTop();` && |\n|  &&
+                           `                            } catch (e) { }` && |\n|  &&
+                           `                        }` && |\n|  &&
+                           `                    });` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                this.oBody.ID = sap.z2ui5.oResponse.ID;` && |\n|  &&
+                           `                this.oBody.CHECKLAUNCHPADACTIVE = sap.z2ui5.checkLaunchpadActive;` && |\n|  &&
+                           `                this.oBody.ARGUMENTS = arguments;` && |\n|  &&
+                           `                try { this.oBody.OCURSOR = sap.ui.getCore().byId(sap.ui.getCore().getCurrentFocusedControlId()).getFocusInfo(); } catch (e) { }` && |\n|  &&
+                           |\n|  &&
+                           `                if (sap.z2ui5.checkLogActive) {` && |\n|  &&
+                           `                    console.log('Request Object:');` && |\n|  &&
+                           `                    console.log(this.oBody);` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                sap.z2ui5.oResponseOld = sap.z2ui5.oResponse;` && |\n|  &&
+                           `                sap.z2ui5.oResponse = {};` && |\n|  &&
+                           `                sap.z2ui5.oBody = this.oBody;` && |\n|  &&
+                           `                sap.z2ui5.isHoldView = oEvent.isHoldView;` && |\n|  &&
+                           `                sap.z2ui5.oController.Roundtrip(oEvent.isHoldView);` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            responseError: function (response) {` && |\n|  &&
+                           `                document.write(response);` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            responseSuccess: function (response) {` && |\n|  &&
+                           |\n|  &&
+                           `                sap.z2ui5.oResponse = JSON.parse(response);` && |\n|  &&
+                           |\n|  &&
+                           `                if (sap.z2ui5.checkLogActive) {` && |\n|  &&
+                           `                    console.log('Response Object:');` && |\n|  &&
+                           `                    console.log(sap.z2ui5.oResponse);` && |\n|  &&
+                           `                    if (sap.z2ui5.oResponse.PARAMS.S_VIEW.XML !== '') {` && |\n|  &&
+                           `                        console.log('UI5-XML-View:');` && |\n|  &&
+                           `                        console.log(sap.z2ui5.oResponse.PARAMS.S_VIEW.XML);` && |\n|  &&
+                           `                    }` && |\n|  &&
+                           `                    if (sap.z2ui5.oResponse.PARAMS.S_POPUP.XML !== '') {` && |\n|  &&
+                           `                        console.log('UI5-XML-Popup:');` && |\n|  &&
+                           `                        console.log(sap.z2ui5.oResponse.PARAMS.S_POPUP.XML);` && |\n|  &&
+                           `                    }` && |\n|  &&
+                           `                }` && |\n|  &&
+                           |\n|  &&
+                           `                var oModel = new sap.ui.model.json.JSONModel(sap.z2ui5.oResponse.OVIEWMODEL);` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_VIEW.CHECK_DESTROY == true) { if (sap.z2ui5.oView) { sap.z2ui5.oView.destroy(); } }` && |\n|  &&
+                           `                if (sap.z2ui5.oResponse.PARAMS.S_VIEW.XML !== '') {` && |\n|  &&
+                           `                    sap.z2ui5.oController.ViewClose();` && |\n|  &&
+                           `                    new sap.ui.core.mvc.XMLView.create({` && |\n|  &&
+                           `                        definition: sap.z2ui5.oResponse.PARAMS.S_VIEW.XML,` && |\n|  &&
+                           `                    }).then(oView => {` && |\n|  &&
+                           `                        oView.setModel(oModel);` && |\n|  &&
+                           `                        if (sap.z2ui5.oParent) {` && |\n|  &&
+                           `                            sap.z2ui5.oParent.removeAllPages();` && |\n|  &&
+                           `                            sap.z2ui5.oParent.insertPage(oView);` && |\n|  &&
+                           `                        } else {` && |\n|  &&
+                           `                            oView.placeAt("content")` && |\n|  &&
+                           `                        };` && |\n|  &&
+                           `                        sap.z2ui5.oView = oView;` && |\n|  &&
+                           `                    },` && |\n|  &&
+                           `                    );` && |\n|  &&
+                           `                } else {` && |\n|  &&
+                           `                    if (sap.z2ui5.oView) {` && |\n|  &&
+                           `                        sap.z2ui5.oView.setModel(oModel);` && |\n|  &&
+                           `                    }` && |\n|  &&
+                           `                    sap.z2ui5.oController.onAfterRendering();` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            readHttp: function () {` && |\n|  &&
+                           |\n|  &&
+                           `                var xhr = new XMLHttpRequest();` && |\n|  &&
+                           `                xhr.open("POST", sap.z2ui5.pathname, true);` && |\n|  &&
+                           `                xhr.onload = function (that) {` && |\n|  &&
+                           |\n|  &&
+                           `                    if (that.target.status !== 200) {` && |\n|  &&
+                           `                        sap.z2ui5.oController.responseError(that.target.response);` && |\n|  &&
+                           `                    } else {` && |\n|  &&
+                           `                        sap.z2ui5.oController.responseSuccess(that.target.response);` && |\n|  &&
+                           `                    }` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `                xhr.send(JSON.stringify(sap.z2ui5.oBody));` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `            Roundtrip: function () {` && |\n|  &&
+                           |\n|  &&
+                           `                sap.z2ui5.checkTimerActive = false;` && |\n|  &&
+                           |\n|  &&
+                           `                sap.z2ui5.oBody.OLOCATION = {};` && |\n|  &&
+                           `                sap.z2ui5.oBody.OLOCATION.ORIGIN = window.location.origin;` && |\n|  &&
+                           `                sap.z2ui5.oBody.OLOCATION.PATHNAME = sap.z2ui5.pathname;` && |\n|  &&
+                           `                sap.z2ui5.oBody.OLOCATION.SEARCH = window.location.search;` && |\n|  &&
+                           `                sap.z2ui5.oBody.OLOCATION.VERSION = sap.ui.getVersionInfo().gav;` && |\n|  &&
+                           |\n|  &&
+                           `                if (sap.z2ui5.readOData) {` && |\n|  &&
+                           `                    sap.z2ui5.readOData();` && |\n|  &&
+                           `                } else {` && |\n|  &&
+                           `                    sap.z2ui5.oController.readHttp();` && |\n|  &&
+                           `                }` && |\n|  &&
+                           `            },` && |\n|  &&
+                           `        });` && |\n|  &&
+                           |\n|  &&
+                           `        if (!sap.z2ui5) {` && |\n|  &&
+                           `            sap.z2ui5 = {};` && |\n|  &&
+                           `        }` && |\n|  &&
+                           `        if (!sap.z2ui5.pathname) {` && |\n|  &&
+                           `            sap.z2ui5.pathname = window.location.pathname;` && |\n|  &&
+                           `          //  sap.z2ui5.pathname = "/sap/bc/http/sap/y2ui5_http_handler/";` && |\n|  &&
+                           `        }` && |\n|  &&
+                           `        if (!sap.z2ui5.checkLaunchpadActive) {` && |\n|  &&
+                           `            sap.z2ui5.checkLaunchpadActive = false;` && |\n|  &&
+                           `        }` && |\n|  &&
+                           |\n|  &&
+                           `        jQuery.sap.require("sap.ui.core.Fragment");` && |\n|  &&
+                           `        jQuery.sap.require("sap.m.MessageToast");` && |\n|  &&
+                           `        jQuery.sap.require("sap.m.MessageBox");` && |\n|  &&
+                           `        jQuery.sap.require("sap.ui.model.json.JSONModel");` && |\n|  &&
+                           |\n|  &&
+                           `        var xml = atob('PA==') + 'mvc:View controllerName="z2ui5_controller" xmlns:mvc="sap.ui.core.mvc" /' + atob('Pg==');` && |\n|  &&
+                           `        var oView = sap.ui.xmlview({ viewContent: xml });` && |\n|  &&
+                           `        sap.z2ui5.oController = oView.getController();` && |\n|  &&
+                           `        sap.z2ui5.checkLogActive = ` && z2ui5_lcl_utility=>get_json_boolean( check_logging ) && `;` && |\n| &&
+                           `        sap.z2ui5.oBody = {};` && |\n|  &&
+                           `        sap.z2ui5.oController.Roundtrip();` && |\n|  &&
+                           |\n|  &&
+                           `    });` && |\n|  &&
                            `</script>` && |\n| &&
-                           `<abc/>` && |\n| &&
                            `</html>`.
 
 *        `        sap.z2ui5.checkLogActive = ` && z2ui5_lcl_utility=>get_json_boolean( check_logging ) && `;` && |\n| &&
diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index 9bc89566..190886d7 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -1079,7 +1079,7 @@ CLASS z2ui5_lcl_fw_app IMPLEMENTATION.
 
     lv_xml_main = lv_xml_main && ` <f:content ` && |\n| &&
     ` > <Label/><Button ` && |\n| &&
-    `  press="` && client->_event( val = `DEMOS` check_view_transit = abap_true ) && `" ` && |\n| &&
+    `  press="` && client->_event( val = `DEMOS` check_view_destroy = abap_true ) && `" ` && |\n| &&
     `  text="Continue..." enabled="` && COND #( WHEN lv_check_demo = abap_true THEN `true` ELSE `false` ) && |" \n| &&
     ` /><Button visible="false"/><Link text="More on github..."  target="_blank" href="https://github.com/abap2UI5/abap2UI5/blob/main/docs/links.md" /></f:content></f:SimpleForm>`.
 
@@ -1256,17 +1256,12 @@ CLASS z2ui5_lcl_fw_handler IMPLEMENTATION.
                                  ELSE model_set_frontend( app = ms_db-o_app t_attri = ms_db-t_attri ) ).
 
     lo_resp->add_attribute( n = `OVIEWMODEL` v = lv_viewmodel apos_active = abap_false ).
-    CLEAR ms_next-s_set-_viewmodel.
-
+    lo_resp->add_attribute( n = `PARAMS`     v = z2ui5_lcl_utility=>trans_any_2_json( ms_next-s_set ) apos_active = abap_false ).
+    lo_resp->add_attribute( n = `ID`         v = ms_db-id ).
 
     ms_next-s_set-path = ss_config-path_info.
 
-    lo_resp->add_attribute( n = `PARAMS` v = z2ui5_lcl_utility=>trans_any_2_json( ms_next-s_set ) apos_active = abap_false ).
-
-    lo_resp->add_attribute( n = `ID`     v = ms_db-id ).
-
     result = lo_resp->get_root( )->stringify( ).
-
     z2ui5_lcl_fw_db=>create( id = ms_db-id db = ms_db ).
 
   ENDMETHOD.
@@ -1698,9 +1693,7 @@ CLASS z2ui5_lcl_fw_client IMPLEMENTATION.
 
   METHOD z2ui5_if_client~_event.
 
-    DATA(lv_hold_view) = xsdbool( check_view_transit = abap_false ).
-
-    result = `onEvent( { 'EVENT' : '` && val && `', 'METHOD' : 'UPDATE' , 'isHoldView' : ` && z2ui5_lcl_utility=>get_json_boolean( lv_hold_view ) && ` }`.
+    result = `onEvent( { 'EVENT' : '` && val && `', 'METHOD' : 'UPDATE' , 'CHECK_VIEW_DESTROY' : ` && z2ui5_lcl_utility=>get_json_boolean( check_view_destroy ) && ` }`.
 
     LOOP AT t_arg REFERENCE INTO DATA(lr_arg).
       result = result && `,` && lr_arg->*.
diff --git a/src/z2ui5_cl_xml_view.clas.abap b/src/z2ui5_cl_xml_view.clas.abap
index 0b42b545..33c94633 100644
--- a/src/z2ui5_cl_xml_view.clas.abap
+++ b/src/z2ui5_cl_xml_view.clas.abap
@@ -317,15 +317,17 @@ CLASS z2ui5_cl_xml_view DEFINITION
       RETURNING VALUE(result)                TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS dialog
-      IMPORTING title         TYPE clike OPTIONAL
-                icon          TYPE clike OPTIONAL
-                showheader    TYPE clike OPTIONAL
-                stretch       TYPE clike OPTIONAL
-                contentheight TYPE clike OPTIONAL
-                contentwidth  TYPE clike OPTIONAL
-                resizable     TYPE clike OPTIONAL
-                  PREFERRED PARAMETER title
-      RETURNING VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
+      IMPORTING
+        title         TYPE clike OPTIONAL
+        icon          TYPE clike OPTIONAL
+        showheader    TYPE clike OPTIONAL
+        stretch       TYPE clike OPTIONAL
+        contentheight TYPE clike OPTIONAL
+        contentwidth  TYPE clike OPTIONAL
+        resizable     TYPE clike OPTIONAL
+          PREFERRED PARAMETER title
+      RETURNING
+        VALUE(result) TYPE REF TO z2ui5_cl_xml_view.
 
     METHODS carousel
       IMPORTING
@@ -1317,6 +1319,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
 
 
   METHOD dialog.
+
     result = _generic( name   = `Dialog`
                        t_prop = VALUE #( ( n = `title`  v = title )
                                          ( n = `icon`  v = icon )
@@ -1325,6 +1328,7 @@ CLASS z2ui5_cl_xml_view IMPLEMENTATION.
                                          ( n = `contentWidth`  v = contentwidth )
                                          ( n = `contentHeight`  v = contentheight )
                                          ( n = `resizable`  v = lcl_utility=>get_json_boolean( resizable ) ) ) ).
+
   ENDMETHOD.
 
 
diff --git a/src/z2ui5_if_client.intf.abap b/src/z2ui5_if_client.intf.abap
index 27bafb91..99fa1f1e 100644
--- a/src/z2ui5_if_client.intf.abap
+++ b/src/z2ui5_if_client.intf.abap
@@ -98,10 +98,10 @@ INTERFACE z2ui5_if_client
       text TYPE string
       type TYPE string DEFAULT 'information'.
 
-    methods timer_set
-        importing
-            interval_ms    type string
-            event_finished type string.
+  METHODS timer_set
+    IMPORTING
+      interval_ms    TYPE string
+      event_finished TYPE string.
 
   METHODS message_toast_display
     IMPORTING
@@ -110,7 +110,7 @@ INTERFACE z2ui5_if_client
   METHODS _event
     IMPORTING
       val                TYPE clike
-      check_view_transit TYPE abap_bool DEFAULT abap_false
+      check_view_destroy TYPE abap_bool    DEFAULT abap_false
       t_arg              TYPE string_table OPTIONAL
     RETURNING
       VALUE(result)      TYPE string.