diff --git a/app/build.gradle b/app/build.gradle
index da5d5759..4e0f17fd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -149,13 +149,13 @@ dependencies {
 //    implementation "com.github.yausername.youtubedl-android:aria2c:$youtubedlAndroidVer"
 
 
-    implementation "io.github.deniscerri.youtubedl-android:library:0.19.0"
+    implementation "io.github.junkfood02.youtubedl-android:library:0.18.1"
 
-    //implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.18.0"
-    implementation "io.github.deniscerri.youtubedl-android:aria2c:0.19.0"
+    //implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.18.1"
+    implementation "io.github.junkfood02.youtubedl-android:aria2c:0.18.1"
 
 //    implementation "io.github.junkfood02.youtubedl-android:library:0.17.4"
-    implementation "io.github.deniscerri.youtubedl-android:ffmpeg:0.19.0"
+    implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.17.2"
 //    implementation "io.github.junkfood02.youtubedl-android:aria2c:0.17.2"
 
     implementation "androidx.appcompat:appcompat:$appCompatVer"
diff --git a/app/src/main/java/com/deniscerri/ytdl/database/repository/ResultRepository.kt b/app/src/main/java/com/deniscerri/ytdl/database/repository/ResultRepository.kt
index e4953f40..77c0fb19 100644
--- a/app/src/main/java/com/deniscerri/ytdl/database/repository/ResultRepository.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/database/repository/ResultRepository.kt
@@ -174,7 +174,14 @@ class ResultRepository(private val resultDao: ResultDao, private val commandTemp
         val res = if (newpipeExtractorResult.isSuccess) {
             newpipeExtractorResult.getOrNull()!!
         }else{
-            ytdlpUtil.getFromYTDL("https://youtu.be/${inputQuery.getIDFromYoutubeURL()}", resultsGenerated = {})
+            val youtubeID = inputQuery.getIDFromYoutubeURL()
+            val url = if (youtubeID == null) {
+                inputQuery
+            } else {
+                "https://youtu.be/${youtubeID}"
+            }
+
+            ytdlpUtil.getFromYTDL( url, resultsGenerated = {})
         }
 
         if (resetResults) {
diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
index 192f46e6..a8b72550 100644
--- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
+++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt
@@ -768,7 +768,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
         }else{
             isPlaylistItem = true
             YoutubeDLRequest(downloadItem.playlistURL!!).apply {
-                if(downloadItem.playlistIndex == null || downloadItem.url.isYoutubeURL()){
+                if(downloadItem.playlistIndex == null || downloadItem.url.isYoutubeURL() && downloadItem.url.getIDFromYoutubeURL() != null){
                     request.addOption("--match-filter", "id~='${downloadItem.url.getIDFromYoutubeURL()}'")
                 }else{
                     request.addOption("-I", "${downloadItem.playlistIndex!!}:${downloadItem.playlistIndex}")
@@ -1384,7 +1384,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co
                 }
 
                 if (downloadItem.videoPreferences.embedSubs) {
-                    if (sharedPreferences.getBoolean("no_keep_subs", false) && !downloadItem.videoPreferences.writeSubs && !downloadItem.videoPreferences.writeAutoSubs) {
+                    if (sharedPreferences.getBoolean("no_keep_subs", false)) {
                         request.addOption("--compat-options", "no-keep-subs")
                     }