diff --git a/src/00/z2ui5_cl_fw_client.clas.abap b/src/00/z2ui5_cl_fw_client.clas.abap
index cb863c0e..c483efaf 100644
--- a/src/00/z2ui5_cl_fw_client.clas.abap
+++ b/src/00/z2ui5_cl_fw_client.clas.abap
@@ -12,6 +12,13 @@ CLASS z2ui5_cl_fw_client DEFINITION
     METHODS constructor
       IMPORTING
         handler TYPE REF TO z2ui5_cl_fw_handler.
+  PROTECTED SECTION.
+
+    METHODS set_arg_string
+      IMPORTING
+        val           TYPE string_table
+      RETURNING
+        VALUE(result) TYPE string.
 
 ENDCLASS.
 
@@ -222,33 +229,22 @@ CLASS z2ui5_cl_fw_client IMPLEMENTATION.
   METHOD z2ui5_if_client~_event.
 
     result = `onEvent( { 'EVENT' : '` && val && `', 'METHOD' : 'UPDATE' , 'CHECK_VIEW_DESTROY' : ` && z2ui5_cl_fw_utility=>get_json_boolean( check_view_destroy ) && ` }`.
-
-    LOOP AT t_arg REFERENCE INTO DATA(lr_arg).
-      DATA(lv_new) = lr_arg->*.
-      IF lv_new IS INITIAL.
-        CONTINUE.
-      ENDIF.
-      IF lv_new(1) <> `$` AND lv_new(1) <> `{`.
-        lv_new = `"` && lv_new && `"`.
-      ENDIF.
-
-      result = result && `, ` && lv_new.
-    ENDLOOP.
-
-    result = result && ` )`.
+    result = result && set_arg_string( t_arg ).
 
   ENDMETHOD.
 
 
   METHOD z2ui5_if_client~_event_client.
 
-    result = `onEventFrontend( { 'EVENT' : '` && val && `' }`.
+    result = `onEventFrontend( { 'EVENT' : '` && val && `' }` && set_arg_string( t_arg ).
 
-    IF t_arg IS NOT INITIAL.
-*      result = result && `, 'T_ARG' : [`.
-*      result = result && `,`.
+  ENDMETHOD.
 
-      LOOP AT t_arg REFERENCE INTO DATA(lr_arg).
+  METHOD set_arg_string.
+
+    IF val IS NOT INITIAL.
+
+      LOOP AT val REFERENCE INTO DATA(lr_arg).
         DATA(lv_new) = lr_arg->*.
         IF lv_new IS INITIAL.
           CONTINUE.
@@ -259,10 +255,10 @@ CLASS z2ui5_cl_fw_client IMPLEMENTATION.
         result = result && `, ` && lv_new.
       ENDLOOP.
 
-*      result = result && `]`.
     ENDIF.
 
     result = result && `)`.
 
   ENDMETHOD.
+
 ENDCLASS.
diff --git a/src/z2ui5_cl_http_handler.clas.abap b/src/z2ui5_cl_http_handler.clas.abap
index f069af32..977b255c 100644
--- a/src/z2ui5_cl_http_handler.clas.abap
+++ b/src/z2ui5_cl_http_handler.clas.abap
@@ -161,6 +161,8 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `                    setTimeout(() => {` && |\n| &&
                            `                        if (sap.z2ui5.checkTimerActive) {` && |\n| &&
                            `                            let method = sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED.split( '(' )[ 0 ];` && |\n| &&
+                           `           //                 let oEvent = JSON.parse( sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED.split( '(' )[ 1 ].split( ')' )[ 0 ].replaceAll( "'" , '"' ) );` && |\n| &&
+                           `                          //  let oArgs = sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED.split( '(' )[ 1 ].split( ')' )[ 0 ].split( ',' );` && |\n| &&
                            `                            let oArgs = [];` && |\n| &&
                            `                            oArgs.push( JSON.parse( (sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED.split( '(' )[ 1 ].split( ')' )[ 0 ].split( '}' )[ 0 ] + '}').replaceAll( "'" , '"' ) ) );` && |\n| &&
                            `                            let oArgsPara = sap.z2ui5.oResponse.PARAMS.S_TIMER.EVENT_FINISHED.split( '(' )[ 1 ].split( ')' )[ 0 ].split( '}' )[ 1 ].split( ',' ).slice(1);` && |\n| &&
@@ -416,12 +418,12 @@ CLASS Z2UI5_CL_HTTP_HANDLER IMPLEMENTATION.
                            `        sap.z2ui5.oController.oUtil = {}; ` && |\n| &&
                            `        sap.z2ui5.oController.oUtil.oDate = {}; ` && |\n| &&
                            `        sap.z2ui5.oController.oUtil.oDate.createObject = (s) => { debugger; return new Date(s); }` && |\n| &&
-                           `  jQuery.sap.declare("z2ui5.Helper");` && |\n|  &&
-                           `z2ui5.Helper = {};` && |\n| &&
-                           `z2ui5.Helper.DateCreateObject = (s => new Date(s));` && |\n| &&
-                           `z2ui5.Helper.DateAbapTimestampToDate = (sTimestamp => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp));` && |\n| &&
-                           `z2ui5.Helper.DateAbapDateToDateObject = (d => new Date(d.slice(0,4), (d[4]+d[5])-1, d[6]+d[7]));` && |\n| &&
-                           `z2ui5.Helper.DateAbapDateTimeToDateObject = ((d,t = '000000') => new Date(d.slice(0,4), (d[4]+d[5])-1, d[6]+d[7],t.slice(0,2),t.slice(2,4),t.slice(4,6)));` && |\n| &&
+                           `  jQuery.sap.declare("sap.z2ui5.Helper");` && |\n|  &&
+                           `sap.z2ui5.Helper = {};` && |\n| &&
+                           `sap.z2ui5.Helper.DateCreateObject = (s => new Date(s));` && |\n| &&
+                           `sap.z2ui5.Helper.DateAbapTimestampToDate = (sTimestamp => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp));` && |\n| &&
+                           `sap.z2ui5.Helper.DateAbapDateToDateObject = (d => new Date(d.slice(0,4), (d[4]+d[5])-1, d[6]+d[7]));` && |\n| &&
+                           `sap.z2ui5.Helper.DateAbapDateTimeToDateObject = ((d,t = '000000') => new Date(d.slice(0,4), (d[4]+d[5])-1, d[6]+d[7],t.slice(0,2),t.slice(2,4),t.slice(4,6)));` && |\n| &&
                            ` });` && |\n| &&
                            `</script>` && |\n| &&
                            `<abc/></html>`.