diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 285ac4b..1281ca8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -21,8 +21,8 @@ android {
         applicationId = "com.ztftrue.music"
         minSdk = 30
         targetSdk = 34
-        versionCode = 16
-        versionName = "0.1.16"
+        versionCode = 17
+        versionName = "0.1.17"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/com/ztftrue/music/MainActivity.kt b/app/src/main/java/com/ztftrue/music/MainActivity.kt
index ff2159a..29363e7 100644
--- a/app/src/main/java/com/ztftrue/music/MainActivity.kt
+++ b/app/src/main/java/com/ztftrue/music/MainActivity.kt
@@ -614,7 +614,7 @@ class MainActivity : ComponentActivity() {
         val isPlaying = resultData.getBoolean("isPlaying")
         musicViewModel.playStatus.value = isPlaying
         val index = resultData.getInt("index")
-        if (index >= 0 && musicViewModel.musicQueue.size > index
+        if (index >= 0 && musicViewModel.musicQueue.size > index&&index != musicViewModel.currentPlayQueueIndex.intValue
         ) {
             musicViewModel.currentMusicCover.value = null
             musicViewModel.currentPlay.value =
diff --git a/app/src/main/java/com/ztftrue/music/MyApplication.kt b/app/src/main/java/com/ztftrue/music/MyApplication.kt
index f9a5416..4f1d2f2 100644
--- a/app/src/main/java/com/ztftrue/music/MyApplication.kt
+++ b/app/src/main/java/com/ztftrue/music/MyApplication.kt
@@ -7,9 +7,9 @@ import android.content.Intent
 class MyApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        Thread.setDefaultUncaughtExceptionHandler { _, e ->
-            handleUncaughtException(e)
-        }
+//        Thread.setDefaultUncaughtExceptionHandler { _, e ->
+//            handleUncaughtException(e)
+//        }
     }
 
     private fun handleUncaughtException(e: Throwable) {
diff --git a/app/src/main/java/com/ztftrue/music/ui/home/AlbumGridView.kt b/app/src/main/java/com/ztftrue/music/ui/home/AlbumGridView.kt
index 92ab4d0..d6e3334 100644
--- a/app/src/main/java/com/ztftrue/music/ui/home/AlbumGridView.kt
+++ b/app/src/main/java/com/ztftrue/music/ui/home/AlbumGridView.kt
@@ -310,7 +310,7 @@ fun AlbumItemView(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Text(
-                    text = "$number song${if (number <= 1L) "" else "s"}",
+                    text = stringResource(R.string.song, number, if (number <= 1L) "" else "s"),
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
                 IconButton(
diff --git a/app/src/main/java/com/ztftrue/music/ui/home/ArtistsGridView.kt b/app/src/main/java/com/ztftrue/music/ui/home/ArtistsGridView.kt
index 0294ba0..bcbfa01 100644
--- a/app/src/main/java/com/ztftrue/music/ui/home/ArtistsGridView.kt
+++ b/app/src/main/java/com/ztftrue/music/ui/home/ArtistsGridView.kt
@@ -308,7 +308,7 @@ fun ArtistItemView(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Text(
-                    text = "$number song${if (number <= 1L) "" else "s"}",
+                    text = stringResource(R.string.song, number, if (number <= 1L) "" else "s"),
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
                 IconButton(
diff --git a/app/src/main/java/com/ztftrue/music/ui/home/FolderListView.kt b/app/src/main/java/com/ztftrue/music/ui/home/FolderListView.kt
index 07b2ffd..6f5c035 100644
--- a/app/src/main/java/com/ztftrue/music/ui/home/FolderListView.kt
+++ b/app/src/main/java/com/ztftrue/music/ui/home/FolderListView.kt
@@ -218,7 +218,7 @@ fun FolderItemView(
                 modifier = Modifier.horizontalScroll(rememberScrollState(0)),
             )
             Text(
-                text = "$number",
+                text = stringResource(R.string.song, number, if (number <= 1L) "" else "s"),
                 color = MaterialTheme.colorScheme.onBackground,
             )
         }
diff --git a/app/src/main/java/com/ztftrue/music/ui/home/GenreGridView.kt b/app/src/main/java/com/ztftrue/music/ui/home/GenreGridView.kt
index d11db52..cd0aaa5 100644
--- a/app/src/main/java/com/ztftrue/music/ui/home/GenreGridView.kt
+++ b/app/src/main/java/com/ztftrue/music/ui/home/GenreGridView.kt
@@ -289,7 +289,7 @@ fun GenreItemView(
                 horizontalArrangement = Arrangement.SpaceBetween
             ) {
                 Text(
-                    text = stringResource(R.string.song, number),
+                    text = stringResource(R.string.song, number, if (number <= 1L) "" else "s"),
                     color = MaterialTheme.colorScheme.onSurfaceVariant,
                 )
                 IconButton(
diff --git a/app/src/main/java/com/ztftrue/music/ui/home/PlayListView.kt b/app/src/main/java/com/ztftrue/music/ui/home/PlayListView.kt
index 461e0bb..f051a2f 100644
--- a/app/src/main/java/com/ztftrue/music/ui/home/PlayListView.kt
+++ b/app/src/main/java/com/ztftrue/music/ui/home/PlayListView.kt
@@ -278,7 +278,7 @@ fun PlayListItemView(
                 modifier = Modifier.horizontalScroll(rememberScrollState(0))
             )
             Text(
-                text = "$number",
+                text = stringResource(R.string.song, number, if (number <= 1L) "" else "s"),
                 color = MaterialTheme.colorScheme.onBackground,
             )
         }
diff --git a/app/src/main/java/com/ztftrue/music/ui/public/MusicItemView.kt b/app/src/main/java/com/ztftrue/music/ui/public/MusicItemView.kt
index 79c6c77..44df339 100644
--- a/app/src/main/java/com/ztftrue/music/ui/public/MusicItemView.kt
+++ b/app/src/main/java/com/ztftrue/music/ui/public/MusicItemView.kt
@@ -59,13 +59,13 @@ import com.ztftrue.music.play.ACTION_PlayLIST_CHANGE
 import com.ztftrue.music.play.ACTION_RemoveFromQueue
 import com.ztftrue.music.play.ACTION_TRACKS_DELETE
 import com.ztftrue.music.sqlData.model.MusicItem
-import com.ztftrue.music.utils.model.AnyListBase
 import com.ztftrue.music.utils.OperateType
 import com.ztftrue.music.utils.PlayListType
-import com.ztftrue.music.utils.trackManager.PlaylistManager
-import com.ztftrue.music.utils.trackManager.TracksManager
 import com.ztftrue.music.utils.Utils
 import com.ztftrue.music.utils.enumToStringForPlayListType
+import com.ztftrue.music.utils.model.AnyListBase
+import com.ztftrue.music.utils.trackManager.PlaylistManager
+import com.ztftrue.music.utils.trackManager.TracksManager
 
 @androidx.annotation.OptIn(UnstableApi::class)
 @OptIn(ExperimentalFoundationApi::class)
@@ -298,6 +298,9 @@ fun MusicItemView(
                         if (playList.type != viewModel.playListCurrent.value?.type || viewModel.playListCurrent.value?.id != playList.id) {
                             viewModel.playListCurrent.value = playList
                             viewModel.musicQueue.clear()
+                            // TODO need re-design, should use event EVENT_changePlayQueue
+                            // avoid can't switch current play lyrics
+                            viewModel.currentPlayQueueIndex.intValue=-1
                             viewModel.musicQueue.addAll(musicList)
                         }
                     }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 2f3584a..e3db754 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -32,7 +32,7 @@
     <string name="flatten_failed">展平失败</string>
     <string name="flatten">展平</string>
     <string name="can_t_find_any_audio_file_i_need_permission_click_here_to_open_settings">没有权限，无法获取音乐，点击设置权限</string>
-    <string name="song">%1$s 歌曲%2$s</string>
+    <string name="song">%1$s 首歌曲</string>
     <string name="settings">设置</string>
     <string name="feedback">反馈</string>
     <string name="exit_app">退出APP</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c9d04a..e096d72 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,4 +99,5 @@
     <string name="play_error_play_next">Play error, auto play next</string>
     <string name="no_dictionary_app_tip">Dictionary app is not installed or your dictionary app do not support this feature.</string>
     <string name="cant_support_feature_tip">You system don\'t support this feature</string>
+
 </resources>
\ No newline at end of file