diff --git a/.htaccess b/.htaccess
index cfe399e689..32dc11880c 100644
--- a/.htaccess
+++ b/.htaccess
@@ -243,8 +243,8 @@ Options All -Indexes
     RewriteRule    ^program/([0-9]+)/([0-9]+)(/.*)?$ view/?playlist_id=$1&playlist_index=$2    [QSA]
     RewriteRule    ^program/([0-9]+)(/.*)?$ view/?playlist_id=$1    [QSA]
     RewriteRule    ^viewProgram/([0-9]+).*?$ view/channelProgram.php?program_id=$1    [QSA]
-    RewriteRule    ^favorite/?$ view/?playlist_id=favorite    [QSA]
-    RewriteRule    ^watch-later/?$ view/?playlist_id=watch-later    [QSA]
+    RewriteRule    ^favorite/?$ view/?playlist_name=favorite    [QSA]
+    RewriteRule    ^watch-later/?$ view/?playlist_name=watch-later    [QSA]
 
     #manager videos
     RewriteRule    ^orphanFiles$ view/orphanFiles.php    [NC,L]
diff --git a/view/index.php b/view/index.php
index bfdb4eaeff..69bc70ede5 100644
--- a/view/index.php
+++ b/view/index.php
@@ -22,6 +22,14 @@ if (!empty($global['systemRootPath']) && empty($config)) {
     error_log(json_encode($global));
 }
 
+    
+if(!empty($_GET['playlist_name']) && empty($_GET['playlist_id'])){
+    if ($_GET['playlist_name'] == "favorite") {
+        $_GET['playlist_id'] = 'favorite';
+    } else {
+        $_GET['playlist_id'] = 'watch-later';
+    }
+}
 require_once $global['systemRootPath'].'plugin/AVideoPlugin.php';
 $firstPage = AVideoPlugin::getFirstPage();
 if (empty($firstPage) || !empty($_GET['videoName']) || !empty($_GET['v']) || !empty($_GET['playlist_id']) || !empty($_GET['liveVideoName']) || !empty($_GET['evideo'])) {