diff --git a/OF DL/Helpers/APIHelper.cs b/OF DL/Helpers/APIHelper.cs
index 44915ce..00ce091 100644
--- a/OF DL/Helpers/APIHelper.cs	
+++ b/OF DL/Helpers/APIHelper.cs	
@@ -1621,7 +1621,7 @@ public async Task<SinglePaidMessageCollection> GetPaidMessage(string endpoint, s
                 {
                     foreach (Messages.Medium medium in message.media)
                     {
-                        if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
+                        if (!messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && !medium.files.full.url.Contains("upload"))
                         {
                             if (medium.type == "photo" && !config.DownloadImages)
                             {
@@ -1647,7 +1647,7 @@ public async Task<SinglePaidMessageCollection> GetPaidMessage(string endpoint, s
                                 singlePaidMessageCollection.SingleMessageMedia.Add(medium);
                             }
                         }
-                        else if (medium.canView && medium.files != null && medium.files.drm != null)
+                        else if (!messagePreviewIds.Contains(medium.id) && medium.canView && medium.files != null && medium.files.drm != null)
                         {
                             if (medium.type == "photo" && !config.DownloadImages)
                             {
@@ -1668,69 +1668,13 @@ public async Task<SinglePaidMessageCollection> GetPaidMessage(string endpoint, s
                             
                             if (!singlePaidMessageCollection.SingleMessages.ContainsKey(medium.id))
                             {
-                               await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.videoSources._720, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
+                               await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.files.drm.manifest.dash, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
                                 singlePaidMessageCollection.SingleMessages.Add(medium.id, $"{medium.files.drm.manifest.dash},{medium.files.drm.signature.dash.CloudFrontPolicy},{medium.files.drm.signature.dash.CloudFrontSignature},{medium.files.drm.signature.dash.CloudFrontKeyPairId},{medium.id},{message.id}");
                                 singlePaidMessageCollection.SingleMessageMedia.Add(medium);
                             }
                         }
                     }
-                }
-                else if (messagePreviewIds.Count > 0)
-                {
-                    foreach(Messages.Medium medium in message.media)
-                    {
-                        if (medium.canView && medium.files != null && medium.files.full != null && !string.IsNullOrEmpty(medium.files.full.url) && messagePreviewIds.Contains(medium.id))
-                        {
-                            if (medium.type == "photo" && !config.DownloadImages)
-                            {
-                                continue;
-                            }
-                            if (medium.type == "video" && !config.DownloadVideos)
-                            {
-                                continue;
-                            }
-                            if (medium.type == "gif" && !config.DownloadVideos)
-                            {
-                                continue;
-                            }
-                            if (medium.type == "audio" && !config.DownloadAudios)
-                            {
-                                continue;
-                            }
-                            if (!singlePaidMessageCollection.SingleMessages.ContainsKey(medium.id))
-                            {
-                                await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.files.full.url, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
-                                singlePaidMessageCollection.SingleMessages.Add(medium.id, medium.files.full.url);
-                                singlePaidMessageCollection.SingleMessageMedia.Add(medium);
-                        }
-                    }
-                    else if (medium.canView && medium.files != null && medium.files.drm != null && messagePreviewIds.Contains(medium.id))
-                    {
-                        if (medium.type == "photo" && !config.DownloadImages)
-                        {
-                            continue;
-                        }
-                        if (medium.type == "video" && !config.DownloadVideos)
-                        {
-                            continue;
-                        }
-                        if (medium.type == "gif" && !config.DownloadVideos)
-                        {
-                            continue;
-                        }
-                        if (medium.type == "audio" && !config.DownloadAudios)
-                        {
-                            continue;
-                        }
-                        if (!singlePaidMessageCollection.SingleMessages.ContainsKey(medium.id))
-                        {
-                            await m_DBHelper.AddMedia(folder, medium.id, message.id, medium.files.drm.manifest.dash, null, null, null, "Messages", medium.type == "photo" ? "Images" : (medium.type == "video" || medium.type == "gif" ? "Videos" : (medium.type == "audio" ? "Audios" : null)), messagePreviewIds.Contains(medium.id) ? true : false, false, null);
-                            singlePaidMessageCollection.SingleMessages.Add(medium.id, $"{medium.files.drm.manifest.dash},{medium.files.drm.signature.dash.CloudFrontPolicy},{medium.files.drm.signature.dash.CloudFrontSignature},{medium.files.drm.signature.dash.CloudFrontKeyPairId},{medium.id},{message.id}");
-                            singlePaidMessageCollection.SingleMessageMedia.Add(medium);
-                        }
-                    }
-                    }
-                }            
+                }  
 
             return singlePaidMessageCollection;
         }
diff --git a/OF DL/Helpers/FileNameHelper.cs b/OF DL/Helpers/FileNameHelper.cs
index 801f847..089c076 100644
--- a/OF DL/Helpers/FileNameHelper.cs	
+++ b/OF DL/Helpers/FileNameHelper.cs	
@@ -48,7 +48,7 @@ public async Task<Dictionary<string, string>> GetFilename(object obj1, object ob
                     }
                     else if((fileProperty == null || drmProperty == null) && propertyName == "mediaCreatedAt")
                     {
-                        object source = GetNestedPropertyValue(obj2, "source.source");
+                        object source = GetNestedPropertyValue(obj2, "files.full.url");
                         if(source != null)
                         {
                             DateTime lastModified = await DownloadHelper.GetMediaLastModified(source.ToString());