diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 5b0d76706d..1ad82dee97 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -91,6 +91,21 @@
 # GoGear SA9200     gogearsa9200
 # Samsung
 # YH820/YH920/YH925 samsungyh*
+<phrase>
+  id: LANG_ROCKBOX_TITLE
+  desc: main menu title
+  user: core
+  <source>
+    *: "Rockbox"
+  </source>
+  <dest>
+    *: "Rockbox"
+  </dest>
+  <voice>
+    *: "Rockbox"
+  </voice>
+</phrase>
+# First item will be shown when P2STR is passed a NULL pointer
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -353,20 +368,6 @@
     *: ""
   </voice>
 </phrase>
-<phrase>
-  id: LANG_ROCKBOX_TITLE
-  desc: main menu title
-  user: core
-  <source>
-    *: "Rockbox"
-  </source>
-  <dest>
-    *: "Rockbox"
-  </dest>
-  <voice>
-    *: "Rockbox"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS
   desc: in the main menu
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 30c681029d..330873c553 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -443,14 +443,14 @@ static int get_tag(int *tag)
         if (first == match[0] && strncasecmp(tagstr, match + 1, tagstr_len - 1) == 0)
         {
             /* check for full match */
-            if ((ptrdiff_t)strlen(match) == tagstr_len)
+            if (match[tagstr_len] == '\0')
             {
                 *tag = get_tag_symbol[i];
                 return 1;
             }
         }
     }
-    logf("NO MATCH: %.*s\n", tagstr_len, tagstr);
+    logf("NO MATCH: %.*s\n", (int)tagstr_len, tagstr);
 
     return -1;
 }
@@ -2293,6 +2293,8 @@ int tagtree_get_filename(struct tree_context* c, char *buf, int buflen)
 
 int tagtree_get_custom_action(struct tree_context* c)
 {
+    if (c->dirlength == 0)
+        return 0;
     return tagtree_get_entry(c, c->selected_item)->customaction;
 }