diff --git a/apps/tagnavi.config b/apps/tagnavi.config
index 0481fe1ebb..7c8e06c9e1 100644
--- a/apps/tagnavi.config
+++ b/apps/tagnavi.config
@@ -12,9 +12,8 @@
 %format "fmt_lastplayed"  "%06d%s - %s" lastplayed artist title %sort = "inverse" %limit = "99" %strip = "6"
 %format "fmt_forgotten"  "%06d%s - %s" lastplayed artist title %limit = "99" %strip = "6"
 %format "fmt_best_tracks" "%02d. %s (%3d)" tracknum title autoscore
-%format "fmt_played"      "(%3d/%d) %s" autoscore playcount title
 %format "fmt_score"       "(%3d) %s-%s" autoscore title artist
-%format "fmt_rating"       "(%2d) %s-%s" rating title artist
+%format "fmt_rating"       "(%2d) %s-%s" rating title artist %sort = "inverse"
 
 # Include our custom menu
 %include "/.rockbox/tagnavi_custom.config"
@@ -107,7 +106,7 @@
 "Album between years" -> album ? year >= "" & year <= "" -> title = "fmt_title"
 "Filename" -> filename ? filename ~ ""
 "Score" -> title = "fmt_score" ? autoscore > ""
-"Rating" -> title = "fmt_rating" ? rating > ""
+"User Rating" -> title = "fmt_rating" ? rating > ""
 "Comment" -> album ? comment ~ "" -> title = "fmt_title"
 
 # Define the runtime sub menu
@@ -133,6 +132,7 @@
 "Composer" -> composer -> album -> title = "fmt_title"
 "Track"    -> title
 "Year"     -> year ? year > "0" -> artist -> album -> title = "fmt_title"
+"User Rating" -> rating -> title = "fmt_title"
 "Recently Added" -> album ? entryage < "4" & commitid > "0" -> title = "fmt_title"
 "A to Z..." ==> "a2z"
 "History..." ==> "runtime"