diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index 58cc2b1d..62b4d1a0 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -1,6 +1,5 @@
 CLASS z2ui5_cl_http_handler DEFINITION
   PUBLIC
-  FINAL
   CREATE PUBLIC .
 
   PUBLIC SECTION.
@@ -191,8 +190,8 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `                    sap.z2ui5.oView.destroy();` && |\n|  &&
                            `                }` && |\n|  &&
                            `                var xhr = new XMLHttpRequest();` && |\n|  &&
-                           `              //  var url = "/sap/bc/http/sap/y2ui5_http_handler/";` && |\n|  &&
-                           `              //  xhr.open("POST", url, true);` && |\n|  &&
+                           `             //   var url = "/sap/bc/http/sap/y2ui5_http_handler/";` && |\n|  &&
+                           `             //   xhr.open("POST", url, true);` && |\n|  &&
                            `                xhr.open("POST", window.location.pathname, true);` && |\n|  &&
                            `                xhr.onload = function (that) {` && |\n|  &&
                            |\n|  &&
diff --git a/src/z2ui5_cl_http_handler.clas.locals_imp.abap b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
index 76667780..07547317 100644
--- a/src/z2ui5_cl_http_handler.clas.locals_imp.abap
+++ b/src/z2ui5_cl_http_handler.clas.locals_imp.abap
@@ -1382,11 +1382,15 @@ CLASS z2ui5_lcl_fw_handler IMPLEMENTATION.
 
     DATA(lv_classname) = ``.
     DATA(lv_path) = z2ui5_lcl_utility=>get_header_val( '~path' ).
-    DATA(lv_origin) = z2ui5_lcl_utility=>get_header_val( 'origin' ).
-    DATA(lv_referer) = z2ui5_lcl_utility=>get_header_val( 'referer' ).
-    REPLACE lv_origin IN lv_referer WITH ``.
-    REPLACE lv_path IN lv_referer WITH ``.
-    SPLIT lv_referer AT `/` INTO lv_classname DATA(lv_dummy).
+    data lt_tab type string_table.
+    split lv_path at `/` into table lt_tab.
+    lv_classname = lt_tab[ lines( lt_tab ) ].
+
+*    DATA(lv_origin) = z2ui5_lcl_utility=>get_header_val( 'origin' ).
+*    DATA(lv_referer) = z2ui5_lcl_utility=>get_header_val( 'referer' ).
+*    REPLACE lv_origin IN lv_referer WITH ``.
+*    REPLACE lv_path IN lv_referer WITH ``.
+*    SPLIT lv_referer AT `/` INTO lv_classname DATA(lv_dummy).
     IF lv_classname IS NOT INITIAL AND lv_classname(1) <> `?`.
       lv_classname = to_upper( lv_classname ).
     ELSE.