diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index 886e003f45..c1ea14f629 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -5289,10 +5289,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "地区"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "标签"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "搜索名称..."
diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
index 23de099f48..48eaa44427 100644
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@@ -5477,10 +5477,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "Región"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Etiquetas"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "Buscar nombre..."
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index df20933595..3b65e23d77 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -5449,10 +5449,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "Regione"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Etichette"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "Cerca per Nome ..."
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index 9516891aef..b850304477 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -5157,10 +5157,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "地域"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "タグ"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "名前で検索..."
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
index 6939e84b4a..70e60d76df 100644
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@@ -5453,10 +5453,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "Região"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Etiquetas"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "Pesquisar nome..."
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index 68a8e57d4f..a37210e00c 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -5269,10 +5269,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "Регион"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Теги"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "Поиск по имени..."
diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h
index bb2094ebe7..a16a5b007d 100644
--- a/intl/msg_hash_tr.h
+++ b/intl/msg_hash_tr.h
@@ -5481,10 +5481,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "Bölge"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Etiketler"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "İsim Ara..."
diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h
index 95d84972b4..411d1b6af2 100644
--- a/intl/msg_hash_uk.h
+++ b/intl/msg_hash_uk.h
@@ -2953,10 +2953,6 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
    "Регіон"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Мітки"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    "Пошук за назвою..."
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 1ebaa0fcab..2d34825526 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -5550,8 +5550,8 @@ MSG_HASH(
    "Region"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
-   "Tags"
+   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAG,
+   "Tag"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
@@ -5573,17 +5573,49 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_ADD_ADDITIONAL_FILTER,
    "Add Additional Filter"
    )
-MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_CATEGORY,
-   "By %s"
-   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS_COUNT,
    "%u Items"
    )
 MSG_HASH(
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY,
-   "Select %s"
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_DEVELOPER,
+   "By Developer"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_PUBLISHER,
+   "By Publisher"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_RELEASE_YEAR,
+   "By Release Year"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_PLAYER_COUNT,
+   "By Player Count"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_GENRE,
+   "By Genre"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_ORIGIN,
+   "By Origin"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_REGION,
+   "By Region"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_FRANCHISE,
+   "By Franchise"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_TAG,
+   "By Tag"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_SYSTEM_NAME,
+   "By System Name"
    )
 
 /* Playlist > Playlist Item */
diff --git a/menu/menu_explore.c b/menu/menu_explore.c
index b448678bb6..15ab6e63a9 100644
--- a/menu/menu_explore.c
+++ b/menu/menu_explore.c
@@ -119,22 +119,22 @@ typedef struct
 
 static const struct
 {
-   enum msg_hash_enums name_enum;
+   enum msg_hash_enums name_enum, by_enum;
    const char* rdbkey;
    bool use_split, is_company, is_numeric;
 }
 explore_by_info[EXPLORE_CAT_COUNT] = 
 {
-   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER,           "developer",   true,  true,  false },
-   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER,           "publisher",   true,  true,  false },
-   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_RELEASE_YEAR, "releaseyear", false, false, true  },
-   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_PLAYER_COUNT, "users",       false, false, true  },
-   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE,               "genre",       true,  false, false },
-   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN,              "origin",      false, false, false },
-   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,       "region",      false, false, false },
-   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE,           "franchise",   false, false, false },
-   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,         "tags",        true,  false, false },
-   { MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME,         "system",      false, false, false },
+   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER,           MENU_ENUM_LABEL_VALUE_EXPLORE_BY_DEVELOPER,    "developer",   true,  true,  false },
+   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER,           MENU_ENUM_LABEL_VALUE_EXPLORE_BY_PUBLISHER,    "publisher",   true,  true,  false },
+   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_RELEASE_YEAR, MENU_ENUM_LABEL_VALUE_EXPLORE_BY_RELEASE_YEAR, "releaseyear", false, false, true  },
+   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_PLAYER_COUNT, MENU_ENUM_LABEL_VALUE_EXPLORE_BY_PLAYER_COUNT, "users",       false, false, true  },
+   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE,               MENU_ENUM_LABEL_VALUE_EXPLORE_BY_GENRE,        "genre",       true,  false, false },
+   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN,              MENU_ENUM_LABEL_VALUE_EXPLORE_BY_ORIGIN,       "origin",      false, false, false },
+   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,       MENU_ENUM_LABEL_VALUE_EXPLORE_BY_REGION,       "region",      false, false, false },
+   { MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE,           MENU_ENUM_LABEL_VALUE_EXPLORE_BY_FRANCHISE,    "franchise",   false, false, false },
+   { MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAG,          MENU_ENUM_LABEL_VALUE_EXPLORE_BY_TAG,          "tags",        true,  false, false },
+   { MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME,         MENU_ENUM_LABEL_VALUE_EXPLORE_BY_SYSTEM_NAME,  "system",      false, false, false },
 };
 
 /* TODO/FIXME - static global */
@@ -1010,8 +1010,7 @@ unsigned menu_displaylist_explore(file_list_t *list)
                goto SKIP_EXPLORE_BY_CATEGORY;
 
          tmplen = snprintf(tmp, sizeof(tmp),
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_BY_CATEGORY),
-               msg_hash_to_str(explore_by_info[cat].name_enum));
+               msg_hash_to_str(explore_by_info[cat].by_enum));
 
          if (is_top && tmplen >= 0 && tmplen < sizeof(tmp) - 5)
          {
@@ -1064,8 +1063,7 @@ SKIP_EXPLORE_BY_CATEGORY:;
       }
 
       explore_append_title(explore_state,
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY),
-            msg_hash_to_str(explore_by_info[current_cat].name_enum));
+            msg_hash_to_str(explore_by_info[current_cat].by_enum));
    }
    else if (
             previous_cat < EXPLORE_CAT_COUNT 
@@ -1088,10 +1086,8 @@ SKIP_EXPLORE_BY_CATEGORY:;
       /* List filtered items in a selected explore by category */
       if (is_filtered_category)
       {
-         explore_append_title(explore_state, " - ");
-         explore_append_title(explore_state,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY),
-               msg_hash_to_str(explore_by_info[current_cat].name_enum));
+         explore_append_title(explore_state, " - %s",
+               msg_hash_to_str(explore_by_info[current_cat].by_enum));
       }
       else
       {
diff --git a/msg_hash.h b/msg_hash.h
index fedc4ea9dd..384944375e 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1866,15 +1866,23 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_RELEASE_YEAR,
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_PLAYER_COUNT,
    MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_REGION,
-   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAGS,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_CATEGORY_TAG,
    MENU_ENUM_LABEL_VALUE_EXPLORE_SEARCH_NAME,
    MENU_ENUM_LABEL_VALUE_EXPLORE_SHOW_ALL,
    MENU_ENUM_LABEL_VALUE_EXPLORE_ADDITIONAL_FILTER,
    MENU_ENUM_LABEL_VALUE_EXPLORE_ALL,
    MENU_ENUM_LABEL_VALUE_EXPLORE_ADD_ADDITIONAL_FILTER,
-   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_CATEGORY,
    MENU_ENUM_LABEL_VALUE_EXPLORE_ITEMS_COUNT,
-   MENU_ENUM_LABEL_VALUE_EXPLORE_SELECT_CATEGORY,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_DEVELOPER,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_PUBLISHER,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_RELEASE_YEAR,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_PLAYER_COUNT,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_GENRE,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_ORIGIN,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_REGION,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_FRANCHISE,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_TAG,
+   MENU_ENUM_LABEL_VALUE_EXPLORE_BY_SYSTEM_NAME,
 
    /* Content information settings */
    MENU_LABEL(CONTENT_INFO_LABEL),