1 files changed, 12 insertions, 7 deletions

diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 2b00d59e1c..285f826425 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -1,11 +1,16 @@
-"Artists"   artist   : album  : title
-"Albums"    album    : title
-"Genres"    genre    : artist : album : title
-"Composers" composer : album  : title
+"Artists"   artist   : album  : title = "%02d. %s" tracknum title
+"Albums"    album    : title = "%02d. %s" tracknum title
+"Genres"    genre    : artist : album : title = "%02d. %s" tracknum title
+"Composers" composer : album : title = "%02d. %s" tracknum title
 "Tracks"    title
-"Search by artist" artist ? artist ~ "" : album : title
-"Search by album" album ? album ~ "" : title
+"Search by artist" artist ? artist ~ "" : album : title = "%02d. %s" tracknum title
+"Search by album" album ? album ~ "" : title = "%02d. %s" tracknum title
 "Search by title" title ? title ~ ""
-"Search by year" artist ? year = "" : album : title
+"Search by year" artist ? year = "" : album : title = "%02d. %s" tracknum title
+"Search by score" title = "(%3d) %s" autoscore title ? autoscore > ""
+"Most played tracks" title = "(%d) %s" playcount title ? playcount > "1"
+"Never played tracks" artist ? playcount == "0" : album : title = "%02d. %s" tracknum title
+"Best tracks" title ? autoscore > "60" & playcount > "1"
 "Example 1" artist ? year >= "2000" & artist ^ "a" : album : title
 "Example 2" genre ? genre ~ "metal" : artist ? year >= "2000" : album ? year >= "2000" : title
+"List played tracks" title = "(%3d/%d) %s" autoscore playcount title ? playcount > "0"