diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index c26b71f7..d87f94b2 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -240,11 +240,12 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `                sap.z2ui5.oBody = {};` && |\n| &&
                            `                let isUpdated = false;` && |\n| &&
                            `                if (sap.z2ui5.oViewPopup) {` && |\n| &&
-                           `                if (sap.z2ui5.oViewPopup.isOpen() == true) {` && |\n| &&
+                           `              // if (sap.z2ui5.oViewPopup.isOpen() == true) {` && |\n| &&
                            `                    sap.z2ui5.oBody.oUpdate = sap.z2ui5.oViewPopup.getModel().getData().oUpdate;` && |\n| &&
                            `                  //  sap.z2ui5.oBody.oUpdate = sap.z2ui5.oView.getModel().getData().oUpdate;` && |\n| &&
                            `                    isUpdated = true;` && |\n| &&
-                           `                    } }` && |\n| &&
+                           `                  //}` && |\n| &&
+                           `                    }` && |\n| &&
                            `              if ( isUpdated == false ) { ` && |\n| &&
                            `              if (sap.z2ui5.oViewPopover) {` && |\n| &&
                            `              if (sap.z2ui5.oViewPopover.isOpen() == true) {` && |\n| &&
diff --git a/src/z2ui5_cl_xml_view.clas.abap b/src/z2ui5_cl_xml_view.clas.abap
index c48dee0d..de0223b8 100644
--- a/src/z2ui5_cl_xml_view.clas.abap
+++ b/src/z2ui5_cl_xml_view.clas.abap
@@ -883,7 +883,8 @@ CLASS z2ui5_cl_xml_view DEFINITION
         !id              TYPE clike OPTIONAL
           PREFERRED PARAMETER value
       RETURNING
-        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view .
+        VALUE(result)    TYPE REF TO z2ui5_cl_xml_view.
+
     METHODS range_slider
       IMPORTING
         !max           TYPE clike OPTIONAL
@@ -897,7 +898,8 @@ CLASS z2ui5_cl_xml_view DEFINITION
         !class         TYPE clike OPTIONAL
         !id            TYPE clike OPTIONAL
       RETURNING
-        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view .
+        VALUE(result)  TYPE REF TO z2ui5_cl_xml_view.
+
     METHODS generic_tag
       IMPORTING
         !arialabelledby TYPE clike OPTIONAL