1 files changed, 7 insertions, 2 deletions

diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 74dfb1d1d9..6eda05ec44 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -14,7 +14,6 @@
 %format "fmt_title"       "%d.%02d. %s - %02d:%02d" discnum tracknum title Lm Ls ? discnum > "0"
 %format "fmt_title"       "%02d. %s - %02d:%02d" tracknum title Lm Ls ? tracknum > "0"
 %format "fmt_title"       "%s - %02d:%02d" title Lm Ls
-%format "fmt_alphanum_title" "%s - %02d:%02d (%s)" basename Lm Ls filename ? title == "<Untagged>"
 %format "fmt_alphanum_title" "%s - %02d:%02d" title Lm Ls
 %format "fmt_mostplayed" "%2d|%3d %s (%s)" playcount autoscore title canonicalartist %sort = "inverse" %limit = "100"
 %format "fmt_lastplayed"  "%06d%s - %s" lastplayed canonicalartist title %sort = "inverse" %limit = "99" %strip = "6"
@@ -165,6 +164,12 @@
 "New favourites" -> canonicalartist ? playcount <= "3" & autoscore > "85" -> album -> title = "fmt_best_tracks"
 "Forgotten favourites" -> title = "fmt_forgotten" ? playcount > "3" & autoscore > "85"
 
+# Define track submenu
+%menu_start "track" "Tracks by"
+"Filename" -> basename
+"Title" -> title
+"Title mm:ss" -> title = "fmt_alphanum_title"
+
 #
 # === Begin of main menu
 #
@@ -176,7 +181,7 @@
 "Album"    -> album    -> title = "fmt_title"
 "Genre"    -> genre    -> canonicalartist -> album -> title = "fmt_title"
 "Composer" -> composer -> album -> title = "fmt_title"
-"Track"    -> title = "fmt_alphanum_title"
+"Track"   ==> "track"
 "Year"     -> year ? year > "0" -> canonicalartist -> album -> title = "fmt_title"
 "User Rating" -> rating -> title = "fmt_title"
 "Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title"