diff --git a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandRemoveStreamByProperty/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandRemoveStreamByProperty/1.0.0/index.js
index b44d2eb..6a5d210 100644
--- a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandRemoveStreamByProperty/1.0.0/index.js
+++ b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandRemoveStreamByProperty/1.0.0/index.js
@@ -66,6 +66,11 @@ var plugin = function (args) {
     var propertyToCheck = String(args.inputs.propertyToCheck).trim();
     var valuesToRemove = String(args.inputs.valuesToRemove).trim().split(',');
     var condition = String(args.inputs.condition);
+    var valuesToRemoveTrimed = [];
+    valuesToRemove.forEach(function (element) {
+        var trimedElement = element.trim();
+        valuesToRemoveTrimed.push(trimedElement);
+    });
     args.variables.ffmpegCommand.streams.forEach(function (stream) {
         var _a;
         var target = '';
@@ -78,8 +83,8 @@ var plugin = function (args) {
         }
         if (target) {
             var prop = String(target).toLowerCase();
-            for (var i = 0; i < valuesToRemove.length; i += 1) {
-                var val = valuesToRemove[i].toLowerCase();
+            for (var i = 0; i < valuesToRemoveTrimed.length; i += 1) {
+                var val = valuesToRemoveTrimed[i].toLowerCase();
                 var prefix = "Removing stream index ".concat(stream.index, " because ").concat(propertyToCheck, " of ").concat(prop);
                 if (condition === 'includes' && prop.includes(val)) {
                     args.jobLog("".concat(prefix, " includes ").concat(val, "\n"));
diff --git a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js
index 49d9165..c5135b6 100644
--- a/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js
+++ b/FlowPlugins/CommunityFlowPlugins/ffmpegCommand/ffmpegCommandSetContainer/1.0.0/index.js
@@ -77,12 +77,15 @@ var plugin = function (args) {
                         }
                     }
                     if (newContainer === 'mp4') {
-                        if ([
-                            'hdmv_pgs_subtitle',
-                            'eia_608',
-                            'timed_id3',
-                            'subrip',
-                        ].includes(codecName)) {
+                        if (codecType === 'attachment'
+                            || [
+                                'hdmv_pgs_subtitle',
+                                'eia_608',
+                                'timed_id3',
+                                'subrip',
+                                'ass',
+                                'ssa',
+                            ].includes(codecName)) {
                             stream.removed = true;
                         }
                     }
@@ -92,6 +95,16 @@ var plugin = function (args) {
                 }
             }
         }
+        // handle gents if coming from odd container
+        var container = args.inputFileObj.container.toLowerCase();
+        if ([
+            'ts',
+            'avi',
+            'mpg',
+            'mpeg',
+        ].includes(container)) {
+            args.variables.ffmpegCommand.overallOuputArguments.push('-fflags', '+genpts');
+        }
     }
     return {
         outputFileObj: args.inputFileObj,