diff --git a/ci/app2string/trans2abap.js b/ci/app2string/trans2abap.js
index e614870b..ed114a3b 100644
--- a/ci/app2string/trans2abap.js
+++ b/ci/app2string/trans2abap.js
@@ -37,7 +37,7 @@ function formatAsAbapClass(content, className, isSpecialFile) {
         line = line.replace(/\s+$/, ''); // Remove trailing spaces
         let formattedLine = `             \`${line.replace(/`/g, '``')}\` && ${isSpecialFile ? '' : '|\\n|  &&'}`;
         formattedLine = formattedLine.replace(/&&\s+$/, '&&'); // Remove trailing spaces after &&
-        if ((index + 1) % 500 === 0) {
+        if ((index + 1) % 400 === 0) {
             return `${formattedLine}\n             |\\n|.\n    result = result &&`;
         }
         return formattedLine;
diff --git a/src/01/03/z2ui5_cl_app_app_js.clas.abap b/src/01/03/z2ui5_cl_app_app_js.clas.abap
index afdd4530..ec815a90 100644
--- a/src/01/03/z2ui5_cl_app_app_js.clas.abap
+++ b/src/01/03/z2ui5_cl_app_app_js.clas.abap
@@ -418,6 +418,8 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `          type: "string",` && |\n|  &&
              `          defaultValue: ""` && |\n|  &&
              `        },` && |\n|  &&
+             |\n|.
+    result = result &&
              `        altitudeAccuracy: {` && |\n|  &&
              `          type: "string",` && |\n|  &&
              `          defaultValue: ""` && |\n|  &&
@@ -518,8 +520,6 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `          defaultValue: "Upload"` && |\n|  &&
              `        },` && |\n|  &&
              `        enabled: {` && |\n|  &&
-             |\n|.
-    result = result &&
              `          type: "boolean",` && |\n|  &&
              `          defaultValue: true` && |\n|  &&
              `        },` && |\n|  &&
@@ -820,6 +820,8 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `          });` && |\n|  &&
              `          return oRangeDataNew;` && |\n|  &&
              `        }));` && |\n|  &&
+             |\n|.
+    result = result &&
              `        //we need to set token text explicitly, as setRangeData does no recalculation` && |\n|  &&
              `        input.getTokens().forEach((token, index) => {` && |\n|  &&
              `          const sTokenText = aRangeData[index].TOKENTEXT;` && |\n|  &&
@@ -1020,8 +1022,6 @@ CLASS z2ui5_cl_app_app_js IMPLEMENTATION.
              `    DateCreateObject: (s) => new Date(s),` && |\n|  &&
              `    //  DateAbapTimestampToDate: (sTimestamp) => new sap.gantt.misc.Format.abapTimestampToDate(sTimestamp), commented for UI5 2.x compatibility` && |\n|  &&
              `    DateAbapDateToDateObject: (d) => new Date(d.slice(0, 4), parseInt(d.slice(4, 6)) - 1, d.slice(6, 8)),` && |\n|  &&
-             |\n|.
-    result = result &&
              `    DateAbapDateTimeToDateObject: (d, t = '000000') => new Date(d.slice(0, 4), parseInt(d.slice(4, 6)) - 1, d.slice(6, 8), t.slice(0, 2), t.slice(2, 4), t.slice(4, 6)),` && |\n|  &&
              `  };` && |\n|  &&
              `}` && |\n|  &&
diff --git a/src/01/03/z2ui5_cl_app_view1_js.clas.abap b/src/01/03/z2ui5_cl_app_view1_js.clas.abap
index a24f209b..0587c5e1 100644
--- a/src/01/03/z2ui5_cl_app_view1_js.clas.abap
+++ b/src/01/03/z2ui5_cl_app_view1_js.clas.abap
@@ -418,6 +418,8 @@ CLASS z2ui5_cl_app_view1_js IMPLEMENTATION.
              `                                break;` && |\n|  &&
              `                            case 'TRIGGER_SMS':` && |\n|  &&
              `                                URLHelper.triggerSms(params);` && |\n|  &&
+             |\n|.
+    result = result &&
              `                                break;` && |\n|  &&
              `                            case 'TRIGGER_TEL':` && |\n|  &&
              `                                URLHelper.triggerTel(params);` && |\n|  &&
@@ -518,8 +520,6 @@ CLASS z2ui5_cl_app_view1_js IMPLEMENTATION.
              `                if (params == undefined) {` && |\n|  &&
              `                    return;` && |\n|  &&
              `                }` && |\n|  &&
-             |\n|.
-    result = result &&
              `                if (params[msgType]?.TEXT !== undefined) {` && |\n|  &&
              `                    if (msgType === 'S_MSG_TOAST') {` && |\n|  &&
              `                        MessageToast.show(params[msgType].TEXT, {` && |\n|  &&