diff --git a/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js
index 9e1ff36..5a1b11c 100644
--- a/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js
+++ b/FlowPlugins/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.js
@@ -71,20 +71,17 @@ var plugin = function (args) {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars,no-param-reassign
     args.inputs = lib.loadDefaultValues(args.inputs, details);
     var buildArrayInput = function (arrayInput) { var _a, _b; return (_b = (_a = String(arrayInput)) === null || _a === void 0 ? void 0 : _a.trim().split(',')) !== null && _b !== void 0 ? _b : []; };
-    var isAMatch = false;
     var fileName = "".concat((args.inputs.includeFileDirectory ? "".concat((0, fileUtils_1.getFileAbosluteDir)(args.inputFileObj._id), "/") : '')
         + (0, fileUtils_1.getFileName)(args.inputFileObj._id), ".").concat((0, fileUtils_1.getContainer)(args.inputFileObj._id));
     var searchCriteriasArray = buildArrayInput(args.inputs.terms)
         .map(function (term) { return term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&'); }); // https://github.com/tc39/proposal-regex-escaping
     if (args.inputs.pattern)
         searchCriteriasArray.push(String(args.inputs.pattern));
-    for (var i = 0; i < searchCriteriasArray.length; i++) {
-        if (new RegExp(searchCriteriasArray[i]).test(fileName)) {
-            isAMatch = true;
-            args.jobLog("'".concat(fileName, "' includes '").concat(searchCriteriasArray[i], "'"));
-            break;
-        }
-    }
+    var searchCriteriaMatched = searchCriteriasArray
+        .find(function (searchCriteria) { return new RegExp(searchCriteria).test(fileName); });
+    var isAMatch = searchCriteriaMatched !== undefined;
+    if (isAMatch)
+        args.jobLog("'".concat(fileName, "' includes '").concat(searchCriteriaMatched, "'"));
     return {
         outputFileObj: args.inputFileObj,
         outputNumber: isAMatch ? 1 : 2,
diff --git a/FlowPluginsTs/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.ts b/FlowPluginsTs/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.ts
index f3aedaa..3cbda14 100644
--- a/FlowPluginsTs/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.ts
+++ b/FlowPluginsTs/CommunityFlowPlugins/file/checkFileNameIncludes/2.0.0/index.ts
@@ -76,7 +76,6 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
 
   const buildArrayInput = (arrayInput: unknown): string[] => String(arrayInput)?.trim().split(',') ?? [];
 
-  let isAMatch = false;
   const fileName = `${(args.inputs.includeFileDirectory ? `${getFileAbosluteDir(args.inputFileObj._id)}/` : '')
     + getFileName(args.inputFileObj._id)
   }.${getContainer(args.inputFileObj._id)}`;
@@ -84,13 +83,10 @@ const plugin = (args: IpluginInputArgs): IpluginOutputArgs => {
     .map((term) => term.replace(/[\\^$*+?.()|[\]{}]/g, '\\$&')); // https://github.com/tc39/proposal-regex-escaping
   if (args.inputs.pattern) searchCriteriasArray.push(String(args.inputs.pattern));
 
-  for (let i = 0; i < searchCriteriasArray.length; i++) {
-    if (new RegExp(searchCriteriasArray[i]).test(fileName)) {
-      isAMatch = true;
-      args.jobLog(`'${fileName}' includes '${searchCriteriasArray[i]}'`);
-      break;
-    }
-  }
+  const searchCriteriaMatched = searchCriteriasArray
+    .find((searchCriteria) => new RegExp(searchCriteria).test(fileName));
+  const isAMatch = searchCriteriaMatched !== undefined;
+  if (isAMatch) args.jobLog(`'${fileName}' includes '${searchCriteriaMatched}'`);
 
   return {
     outputFileObj: args.inputFileObj,