diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs
index f53c2dc..4556349 100644
--- a/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs
+++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSong.cs
@@ -62,8 +62,8 @@ namespace DualScreenDemo
             isOnOrderedSongsPage = false;
 
             int songLimit = ReadHotSongLimit(); 
-
-            guoYuSongs = GetSongsByCategory("國語", songLimit);
+            string query = $"SELECT * FROM SongLibrary WHERE `語別` = '國語' ORDER BY `點播次數` DESC LIMIT {songLimit}";
+            var guoYuSongs = SearchSongs_Mysql(query);
             UpdateSongList(guoYuSongs);
 
             SetButtonsVisibility();
diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs
index 8509bff..8334b15 100644
--- a/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs
+++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSongMandarinNew.cs
@@ -9,7 +9,7 @@ namespace DualScreenDemo
 
             int songLimit = ReadHotSongLimit(); 
             
-            string query = $"SELECT * FROM SongLibrary WHERE `語別` = '國語' ORDER BY `新增日期` DESC LIMIT {songLimit}";
+            string query = $"SELECT * FROM SongLibrary WHERE `語別` = '國語' ORDER BY `新增日期` DESC ,`點播次數` DESC LIMIT {songLimit}";
             var selectedSongs = PrimaryForm.Instance.SearchSongs_Mysql(query);
 
             currentPage = 0; 
diff --git a/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs b/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs
index 0cde60f..2c36775 100644
--- a/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs
+++ b/PrimaryFormParts/HotSong/PrimaryForm.HotSongTaiwaneseNew.cs
@@ -9,7 +9,7 @@ namespace DualScreenDemo
 
             int songLimit = ReadHotSongLimit(); 
             
-            string query = $"SELECT * FROM SongLibrary WHERE `語別` = '台語' ORDER BY `新增日期` DESC LIMIT {songLimit}";
+            string query = $"SELECT * FROM SongLibrary WHERE `語別` = '台語' ORDER BY `新增日期` DESC ,`點播次數` DESC LIMIT {songLimit}";
             var selectedSongs = SearchSongs_Mysql(query);
             
             currentPage = 0; 
diff --git a/PrimaryFormParts/PrimaryForm.cs b/PrimaryFormParts/PrimaryForm.cs
index 809e46c..1c4a5fd 100644
--- a/PrimaryFormParts/PrimaryForm.cs
+++ b/PrimaryFormParts/PrimaryForm.cs
@@ -182,20 +182,13 @@ namespace DualScreenDemo
         public List<SongData> currentSongList;
         public List<Artist> currentArtistList;
         public List<SongData> publicSongList;
-        private List<SongData> guoYuSongs;
-        private List<SongData> guoYuSongs2;
-        private List<SongData> taiYuSongs2;
-        private List<SongData> yueYuSongs2;
-        private List<SongData> yingWenSongs2;
-        private List<SongData> riYuSongs2;
-        private List<SongData> hanYuSongs2;
-        //private List<SongData> loveDuetSongs;
-        //private List<SongData> talentShowSongs;
-        //private List<SongData> medleyDanceSongs;
-        //private List<SongData> ninetiesSongs;
-        //private List<SongData> nostalgicSongs;
-        //private List<SongData> chinaSongs;
-        //private List<SongData> vietnameseSongs;
+        //private List<SongData> guoYuSongs;
+        //private List<SongData> guoYuSongs2;
+        //private List<SongData> taiYuSongs2;
+        //private List<SongData> yueYuSongs2;
+        //private List<SongData> yingWenSongs2;
+        //private List<SongData> riYuSongs2;
+        //private List<SongData> hanYuSongs2;
         public static List<SongData> userRequestedSongs;
         public static List<SongData> playedSongsHistory;
         public static List<PlayState> playStates;