diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index aca79cb786..2b612d5efe 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -2010,6 +2010,18 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
          return "Compiled against API";
       case MSG_FAILED_TO_LOAD:
          return "Failed to load";
+      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG:
+         return "Analog supported";
+      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP:
+         return "Co-op supported";
+      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW:
+         return "Enhancement Hardware";
+      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING:
+         return "ELSPA Rating";
+      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RUMBLE:
+         return "Rumble supported";
+      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING:
+         return "PEGI Rating";
       case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_ISSUE:
          return "Edge Magazine Issue";
       case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_BBFC_RATING:
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 68d504b39d..c301995992 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1987,21 +1987,24 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
       }
       if (db_info_entry->elspa_rating)
       {
-         if (create_string_list_rdb_entry_string("ELSPA Rating",
+         if (create_string_list_rdb_entry_string(
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING),
                   msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_ELSPA_RATING),
                   db_info_entry->elspa_rating, info->path, info->list) == -1)
             goto error;
       }
       if (db_info_entry->pegi_rating)
       {
-         if (create_string_list_rdb_entry_string("PEGI Rating",
+         if (create_string_list_rdb_entry_string(
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING),
                   msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_PEGI_RATING),
                   db_info_entry->pegi_rating, info->path, info->list) == -1)
             goto error;
       }
       if (db_info_entry->enhancement_hw)
       {
-         if (create_string_list_rdb_entry_string("Enhancement Hardware",
+         if (create_string_list_rdb_entry_string(
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW),
                   msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_ENHANCEMENT_HW),
                   db_info_entry->enhancement_hw, info->path, info->list) == -1)
             goto error;
@@ -2025,7 +2028,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
 
       if (db_info_entry->analog_supported == 1)
       {
-         if (create_string_list_rdb_entry_string("Analog supported",
+         if (create_string_list_rdb_entry_string(
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG),
                   msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_ANALOG),
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TRUE), info->path, info->list) == -1)
             goto error;
@@ -2033,7 +2037,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
 
       if (db_info_entry->rumble_supported == 1)
       {
-         if (create_string_list_rdb_entry_string("Rumble supported",
+         if (create_string_list_rdb_entry_string(
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RUMBLE),
                   msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_RUMBLE),
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TRUE), info->path, info->list) == -1)
             goto error;
@@ -2041,7 +2046,8 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
 
       if (db_info_entry->coop_supported == 1)
       {
-         if (create_string_list_rdb_entry_string("Co-op supported",
+         if (create_string_list_rdb_entry_string(
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP),
                   msg_hash_to_str(MENU_ENUM_LABEL_RDB_ENTRY_COOP),
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TRUE), info->path, info->list) == -1)
             goto error;
@@ -3170,8 +3176,6 @@ static int menu_displaylist_parse_generic(
    dir_list_sort(str_list, true);
 
    list_size = str_list->size;
-    
-    
 
    if (list_size == 0)
    {
diff --git a/msg_hash.h b/msg_hash.h
index 0ee813413c..60b2a0e66a 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -975,11 +975,15 @@ enum msg_hash_enums
 
    /* RDB Settings */
    MENU_ENUM_LABEL_RDB_ENTRY_ANALOG,
+   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
+   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RUMBLE,
+   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP,
    MENU_ENUM_LABEL_RDB_ENTRY_RUMBLE,
    MENU_ENUM_LABEL_RDB_ENTRY_COOP,
    MENU_ENUM_LABEL_RDB_ENTRY_START_CONTENT,
    MENU_ENUM_LABEL_RDB_ENTRY_DESCRIPTION,
    MENU_ENUM_LABEL_RDB_ENTRY_GENRE,
+   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW,
    MENU_ENUM_LABEL_RDB_ENTRY_ENHANCEMENT_HW,
    MENU_ENUM_LABEL_RDB_ENTRY_FRANCHISE,
    MENU_ENUM_LABEL_RDB_ENTRY_ORIGIN,
@@ -990,7 +994,9 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_RDB_ENTRY_ESRB_RATING,
    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_BBFC_RATING,
    MENU_ENUM_LABEL_RDB_ENTRY_BBFC_RATING,
+   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING,
    MENU_ENUM_LABEL_RDB_ENTRY_ELSPA_RATING,
+   MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING,
    MENU_ENUM_LABEL_RDB_ENTRY_PEGI_RATING,
    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CERO_RATING,
    MENU_ENUM_LABEL_RDB_ENTRY_CERO_RATING,