diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 2922868039..447f3b22e7 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1942,17 +1942,9 @@ static int action_ok_lookup_setting(const char *path,
 
 
 #ifdef HAVE_NETWORKING
-enum
-{
-   ACTION_OK_NETWORK_CORE_CONTENT_LIST = 0,
-   ACTION_OK_NETWORK_CORE_UPDATER_LIST,
-   ACTION_OK_NETWORK_THUMBNAILS_UPDATER_LIST,
-   ACTION_OK_NETWORK_LAKKA_LIST
-};
-
 static int generic_action_ok_network(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
-      unsigned type_id)
+      enum menu_hash_enums enum_idx)
 {
    char url_path[PATH_MAX_LENGTH] = {0};
    settings_t *settings           = config_get_ptr();
@@ -1968,42 +1960,44 @@ static int generic_action_ok_network(const char *path,
 
    command_event(CMD_EVENT_NETWORK_INIT, NULL);
 
-   switch (type_id)
+   switch (enum_idx)
    {
-      case ACTION_OK_NETWORK_CORE_CONTENT_LIST:
+      case MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST:
          fill_pathname_join(url_path, settings->network.buildbot_assets_url,
                "cores/gw/.index", sizeof(url_path));
-         url_label = "cb_core_content_list";
-         type_id2 = ACTION_OK_DL_CORE_CONTENT_LIST;
-         callback = cb_net_generic;
+         url_label = menu_hash_to_str_enum(enum_idx);
+         type_id2  = ACTION_OK_DL_CORE_CONTENT_LIST;
+         callback  = cb_net_generic;
          break;
-      case ACTION_OK_NETWORK_CORE_UPDATER_LIST:
+      case MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST:
          fill_pathname_join(url_path, settings->network.buildbot_url,
                ".index-extended", sizeof(url_path));
-         url_label = "cb_core_updater_list";
+         url_label = menu_hash_to_str_enum(enum_idx);
          type_id2  = ACTION_OK_DL_CORE_UPDATER_LIST;
-         callback = cb_net_generic;
+         callback  = cb_net_generic;
          break;
-      case ACTION_OK_NETWORK_THUMBNAILS_UPDATER_LIST:
+      case MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST:
          fill_pathname_join(url_path,
                "http://thumbnailpacks.libretro.com",
                ".index", sizeof(url_path));
-         url_label = "cb_thumbnails_updater_list";
+         url_label = menu_hash_to_str_enum(enum_idx);
          type_id2  = ACTION_OK_DL_THUMBNAILS_UPDATER_LIST;
-         callback = cb_net_generic;
+         callback  = cb_net_generic;
          break;
 #ifdef HAVE_LAKKA
-      case ACTION_OK_NETWORK_LAKKA_LIST:
+      case MENU_ENUM_LABEL_CB_LAKKA_LIST:
          /* TODO unhardcode this path */
          fill_pathname_join(url_path, "http://mirror.lakka.tv/nightly",
                LAKKA_PROJECT, sizeof(url_path));
          fill_pathname_join(url_path, url_path,
                ".index", sizeof(url_path));
-         url_label = "cb_lakka_list";
+         url_label = menu_hash_to_str_enum(enum_idx);
          type_id2  = ACTION_OK_DL_LAKKA_LIST;
-         callback = cb_net_generic;
+         callback  = cb_net_generic;
          break;
 #endif
+      default:
+         break;
    }
 
    task_push_http_transfer(url_path, false, url_label, callback, NULL);
@@ -2016,28 +2010,28 @@ static int action_ok_core_content_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    return generic_action_ok_network(path, label, type, idx, entry_idx,
-         ACTION_OK_NETWORK_CORE_CONTENT_LIST);
+         MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST);
 } 
 
 static int action_ok_core_updater_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    return generic_action_ok_network(path, label, type, idx, entry_idx,
-         ACTION_OK_NETWORK_CORE_UPDATER_LIST);
+         MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST);
 }
 
 static int action_ok_thumbnails_updater_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    return generic_action_ok_network(path, label, type, idx, entry_idx,
-         ACTION_OK_NETWORK_THUMBNAILS_UPDATER_LIST);
+         MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST);
 }
 
 static int action_ok_lakka_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    return generic_action_ok_network(path, label, type, idx, entry_idx,
-         ACTION_OK_NETWORK_LAKKA_LIST);
+         MENU_ENUM_LABEL_CB_LAKKA_LIST);
 }
 
 #endif
diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index d7a85a3086..c6fe6f28de 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -26,6 +26,14 @@ static const char *menu_hash_to_str_us_label_enum(enum menu_hash_enums msg)
 {
    switch (msg)
    {
+      case MENU_ENUM_LABEL_CB_LAKKA_LIST:
+         return "cb_lakka_list";
+      case MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST:
+         return "cb_thumbnails_updater_list";
+      case MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST:
+         return "cb_core_updater_list";
+      case MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST:
+         return "cb_core_content_list";
       case MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD:
          return "cb_core_thumbnails_download";
       case MENU_ENUM_LABEL_CB_CORE_UPDATER_DOWNLOAD:
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index fd09e1d41c..a3a94af983 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -1290,6 +1290,10 @@ enum menu_hash_enums
    /* Callback strings */
    MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD,
    MENU_ENUM_LABEL_CB_UPDATE_OVERLAYS,
+   MENU_ENUM_LABEL_CB_CORE_UPDATER_LIST,
+   MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST,
+   MENU_ENUM_LABEL_CB_LAKKA_LIST,
+   MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST,
    MENU_ENUM_LABEL_CB_UPDATE_DATABASES,
    MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD,
    MENU_ENUM_LABEL_CB_UPDATE_CHEATS,