diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 7bd0e7cce3..be0191b521 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -827,12 +827,6 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
       MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST,
       deferred_push_accounts_cheevos_list
    },
-#ifdef HAVE_LIBRETRODB
-   {
-      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST,
-      deferred_push_cursor_manager_list_deferred
-   },
-#endif
    {
       MENU_ENUM_LABEL_DEFERRED_CORE_LIST,
       deferred_push_core_list_deferred
@@ -858,6 +852,18 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
       deferred_push_cursor_manager_list_deferred_query_rdb_entry_cero_rating
    },
 #ifdef HAVE_LIBRETRODB
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS,
+      deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST,
+      deferred_push_cursor_manager_list_deferred
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING,
+      deferred_push_cursor_manager_list_deferred_query_rdb_entry_famitsu_magazine_rating
+   },
    {
       MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_RELEASEMONTH,
       deferred_push_cursor_manager_list_deferred_query_rdb_entry_releasemonth
@@ -874,6 +880,18 @@ static struct cbs_deferred_lbl_callback cbs_deferred_lbl_list[] = {
       MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_DEVELOPER,
       deferred_push_cursor_manager_list_deferred_query_rdb_entry_developer
    },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN,
+      deferred_push_cursor_manager_list_deferred_query_rdb_entry_origin,
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE,
+      deferred_push_cursor_manager_list_deferred_query_rdb_entry_franchise
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ENHANCEMENT_HW,
+      deferred_push_cursor_manager_list_deferred_query_rdb_entry_enhancement_hw
+   },
 #endif
    {
       MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ESRB_RATING,
@@ -1352,23 +1370,6 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
          case MENU_LABEL_DEFERRED_VIDEO_FILTER:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_video_filter);
             break;
-#ifdef HAVE_LIBRETRODB
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_origin);
-            break;
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_franchise);
-            break;
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ENHANCEMENT_HW:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_enhancement_hw);
-            break;
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_famitsu_magazine_rating);
-            break;
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS:
-            BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users);
-            break;
-#endif
          case MENU_LABEL_CONTENT_COLLECTION_LIST:
             BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_content_collection_list);
             break;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index 5958ecdc87..44d15d2809 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -782,6 +782,18 @@ static struct cbs_title_lbl_callback cbs_title_lbl_list[] = {
       MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_PUBLISHER,
       action_get_title_list_rdb_entry_publisher
    },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN,
+      action_get_title_list_rdb_entry_origin
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE,
+      action_get_title_list_rdb_entry_franchise
+   },
+   {
+      MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS,
+      action_get_title_list_rdb_entry_max_users
+   },
    {
       MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_EDGE_MAGAZINE_ISSUE,
       action_get_title_list_rdb_entry_edge_magazine_issue
@@ -1119,15 +1131,6 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs,
    {
       switch (label_hash)
       {
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_list_rdb_entry_origin);
-            break;
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_list_rdb_entry_franchise);
-            break;
-         case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS:
-            BIND_ACTION_GET_TITLE(cbs, action_get_title_list_rdb_entry_max_users);
-            break;
          case MENU_LABEL_DEFERRED_RDB_ENTRY_DETAIL:
             BIND_ACTION_GET_TITLE(cbs, action_get_title_list_rdb_entry_database_info);
             break;
diff --git a/msg_hash.h b/msg_hash.h
index 4989f757a1..00c9513a48 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1739,11 +1739,6 @@ enum msg_hash_enums
 
 #define MENU_LABEL_DEFERRED_VIDEO_FILTER                                       0x966ad201U
 #define MENU_LABEL_DEFERRED_CORE_LIST_SET                                      0xa6d5fdb4U
-#define MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ORIGIN               0x4ebaa767U
-#define MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FRANCHISE            0x77f9eff2U
-#define MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_FAMITSU_MAGAZINE_RATING 0xbf7ff5e7U
-#define MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_ENHANCEMENT_HW       0x9866bda3U
-#define MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST_RDB_ENTRY_MAX_USERS            0xbfcba816U
 #define MENU_LABEL_DEFERRED_RDB_ENTRY_DETAIL                                   0xc35416c0U
 #define MENU_LABEL_DEFERRED_RPL_ENTRY_ACTIONS                                  0x358a7494U
 #define MENU_LABEL_DEFERRED_ARCHIVE_ACTION_DETECT_CORE                         0xdc9c0064U