diff --git a/tasks/Sponsorblock.cs b/tasks/Sponsorblock.cs
index 927c201..204e33a 100644
--- a/tasks/Sponsorblock.cs
+++ b/tasks/Sponsorblock.cs
@@ -72,10 +72,6 @@ namespace ttrss_co_client.tasks
                 {
                     contentSegments.Add(new Tuple<double, double>(previousEdge, junkSegment.segment[0]));
                     previousEdge = junkSegment.segment[1];
-                    if(previousEdge < 0.5)
-                    {
-                        contentSegments.Clear();
-                    }
                 }
                 contentSegments.Add(new Tuple<double, double>(previousEdge, segments.First().videoDuration));
                 contentSegments = contentSegments.Except(contentSegments.Where(tup => tup.Item2 - tup.Item1 < 0.5)).ToList();
diff --git a/tasks/StandardDL.cs b/tasks/StandardDL.cs
index 5e055cd..9ef83f7 100644
--- a/tasks/StandardDL.cs
+++ b/tasks/StandardDL.cs
@@ -44,9 +44,19 @@ namespace ttrss_co_client.tasks
                 }
                 else
                 {
-                    var outputFilename = res.Data;
                     Console.WriteLine($"{headline.title} downloaded.");
 
+                    var outputFilename = res.Data;
+                    
+                    foreach(char c in "'\"")
+                    {
+                        outputFilename = outputFilename.Replace(c, '_');
+                    }
+                    if(outputFilename != res.Data)
+                    {
+                        File.Move(res.Data, outputFilename);
+                    }
+
                     var toReturn = new WorkOrder()
                     {
                         articleId = headline.id,//<-- that way later tasks can update the note
@@ -59,7 +69,7 @@ namespace ttrss_co_client.tasks
                     {
                         Console.WriteLine($"{headline.title} needs conversion task.");
                         toReturn.Phase2TaskList[0] = "convert";
-                        toReturn.data["conversion-target"] = outputFilename.Substring(0, res.Data.LastIndexOf('.')) + ".mp4";
+                        toReturn.data["conversion-target"] = outputFilename.Substring(0, outputFilename.LastIndexOf('.')) + ".mp4";
                     }
 
                     if(headline.link.Host.EndsWith("youtube.com"))