diff --git a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
index cc10287..77d5d9d 100644
--- a/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
+++ b/PrimaryFormParts/PrimaryForm.MultiPagePanel.cs
@@ -489,8 +489,8 @@ namespace DualScreenDemo
 
                 if (artistText.Length > 3)
                 {
-                    artistLabel.Location = new Point(artistX - 581, y + 33);
-                    artistLabel.Size = new Size(artistWidth + 573, ItemHeight - 35);
+                    artistLabel.Location = new Point(artistX - 502, y + 33);
+                    artistLabel.Size = new Size(artistWidth + 490, ItemHeight - 35);
                 }
 
                 artistLabel.Text = artistText;
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs
index e183683..c4809bc 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.BopomofoSearch.cs
@@ -312,7 +312,7 @@ namespace DualScreenDemo
             
             string query = string.IsNullOrWhiteSpace(searchText)
                             ? "SELECT * FROM song_library_cache ORDER BY `song_id` DESC LIMIT 1000;"
-                            : $"SELECT * FROM song_library_cache WHERE `phonetic_abbr` LIKE '{searchText}%' ORDER BY `song_id`;";
+                            : $"SELECT * FROM song_library_cache WHERE `phonetic_abbr` LIKE '{searchText}%' ORDER BY `song_name`;";
 
             var searchResults = SearchSongs_Mysql(query);             
             // 重置分頁    
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.EnglishSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.EnglishSearch.cs
index f57a3ff..c766768 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.EnglishSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.EnglishSearch.cs
@@ -231,7 +231,7 @@ namespace DualScreenDemo
             // 檢查是否為空字串或空白字元
             string query = string.IsNullOrWhiteSpace(searchText)
                 ? "SELECT * FROM song_library_cache ORDER BY song_id DESC LIMIT 1000;"
-                : $"SELECT * FROM song_library_cache WHERE song_name LIKE '{searchText}%' ORDER BY song_id DESC;";
+                : $"SELECT * FROM song_library_cache WHERE song_name LIKE '{searchText}%' ORDER BY song_name DESC;";
 
             var searchResults = SearchSongs_Mysql(query);              
             // 重置分頁    
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.HandwritingSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.HandwritingSearch.cs
index 8688f94..5ccefdb 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.HandwritingSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.HandwritingSearch.cs
@@ -288,7 +288,7 @@ namespace DualScreenDemo
             // 例如：根據輸入框的內容搜尋歌曲
             string query = string.IsNullOrWhiteSpace(searchText)
                 ? "SELECT * FROM song_library_cache ORDER BY song_id DESC LIMIT 1000;"
-                : $"SELECT * FROM song_library_cache WHERE song_name LIKE '{searchText}%' ORDER BY song_id DESC;";
+                : $"SELECT * FROM song_library_cache WHERE song_name LIKE '{searchText}%' ORDER BY song_name DESC;";
 
 
             var searchResults = SearchSongs_Mysql(query);              
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.PinyinSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.PinyinSearch.cs
index 0de713d..2fed37c 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.PinyinSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.PinyinSearch.cs
@@ -267,7 +267,7 @@ namespace DualScreenDemo
             // 例如：根據輸入框的內容搜尋歌曲
             string query = string.IsNullOrWhiteSpace(searchText)
                 ? "SELECT * FROM song_library_cache ORDER BY song_id DESC LIMIT 1000;"
-                : $"SELECT * FROM song_library_cache WHERE pinyin_abbr LIKE '{searchText}%' ORDER BY `song_id` DESC;";
+                : $"SELECT * FROM song_library_cache WHERE pinyin_abbr LIKE '{searchText}%' ORDER BY `song_name` DESC;";
             var searchResults = SearchSongs_Mysql(query);              
             // 重置分頁    
             currentPage = 0;
diff --git a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs
index d150b91..9a66fee 100644
--- a/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs
+++ b/PrimaryFormParts/SongSearch/PrimaryForm.SongSearch.WordCountSearch.cs
@@ -509,7 +509,7 @@ namespace DualScreenDemo
             string query;
             if (int.TryParse(searchText, out int length))
             {
-                query = $"SELECT * FROM song_library_cache WHERE CHAR_LENGTH(song_name) = {length} ;";
+                query = $"SELECT * FROM song_library_cache WHERE CHAR_LENGTH(song_name) = {length} order by 'song_name' DESC ;";
             }
             else
             {