diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c
index c96daa07eb..cb78d3044c 100644
--- a/menu/intl/menu_hash_us.c
+++ b/menu/intl/menu_hash_us.c
@@ -557,6 +557,20 @@ static const char *menu_hash_to_str_us_label(uint32_t hash)
          return "deferred_core_updater_list";
       case MENU_LABEL_AUDIO_DSP_PLUGIN:
          return "audio_dsp_plugin";
+      case MENU_LABEL_UPDATE_ASSETS:
+         return "update_assets";
+      case MENU_LABEL_UPDATE_CHEATS:
+         return "update_cheats";
+      case MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES:
+         return "update_autoconfig_profiles";
+      case MENU_LABEL_UPDATE_DATABASES:
+         return "update_databases";
+      case MENU_LABEL_UPDATE_OVERLAYS:
+         return "update_overlays";
+      case MENU_LABEL_UPDATE_CG_SHADERS:
+         return "update_cg_shaders";
+      case MENU_LABEL_UPDATE_GLSL_SHADERS:
+         return "update_glsl_shaders";
       default:
          break;
    }
@@ -1123,6 +1137,20 @@ const char *menu_hash_to_str_us(uint32_t hash)
          return "OFF";
       case MENU_VALUE_ON:
          return "ON";
+      case MENU_LABEL_VALUE_UPDATE_ASSETS:
+         return "Update Assets";
+      case MENU_LABEL_VALUE_UPDATE_CHEATS:
+         return "Update Cheats";
+      case MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES:
+         return "Update Autoconfig Profiles";
+      case MENU_LABEL_VALUE_UPDATE_DATABASES:
+         return "Update Databases";
+      case MENU_LABEL_VALUE_UPDATE_OVERLAYS:
+         return "Update Overlays";
+      case MENU_LABEL_VALUE_UPDATE_CG_SHADERS:
+         return "Update Cg Shaders";
+      case MENU_LABEL_VALUE_UPDATE_GLSL_SHADERS:
+         return "Update GLSL Shaders";
       default:
          break;
    }
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 60ea6d23a8..74cea93717 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1583,6 +1583,45 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
          menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_LIST),
          menu_hash_to_str(MENU_LABEL_CORE_UPDATER_LIST),
          MENU_SETTING_ACTION, 0, 0);
+
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_ASSETS),
+         menu_hash_to_str(MENU_LABEL_UPDATE_ASSETS),
+         MENU_SETTING_ACTION, 0, 0);
+
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES),
+         menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES),
+         MENU_SETTING_ACTION, 0, 0);
+
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CHEATS),
+         menu_hash_to_str(MENU_LABEL_UPDATE_CHEATS),
+         MENU_SETTING_ACTION, 0, 0);
+
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_DATABASES),
+         menu_hash_to_str(MENU_LABEL_UPDATE_DATABASES),
+         MENU_SETTING_ACTION, 0, 0);
+
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_OVERLAYS),
+         menu_hash_to_str(MENU_LABEL_UPDATE_OVERLAYS),
+         MENU_SETTING_ACTION, 0, 0);
+
+#ifdef HAVE_CG
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CG_SHADERS),
+         menu_hash_to_str(MENU_LABEL_UPDATE_CG_SHADERS),
+         MENU_SETTING_ACTION, 0, 0);
+#endif
+
+#ifdef HAVE_GLSL
+   menu_list_push(info->list,
+         menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_GLSL_SHADERS),
+         menu_hash_to_str(MENU_LABEL_UPDATE_GLSL_SHADERS),
+         MENU_SETTING_ACTION, 0, 0);
+#endif
 #else
    menu_list_push(info->list,
          menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
diff --git a/menu/menu_hash.h b/menu/menu_hash.h
index 7535dea20c..c977c07f95 100644
--- a/menu/menu_hash.h
+++ b/menu/menu_hash.h
@@ -52,6 +52,27 @@ extern "C" {
 #define MENU_VALUE_OPEN_ARCHIVE                                                0x96da22b9U
 #define MENU_VALUE_ASK_ARCHIVE                                                 0x0b87d6a4U
 
+#define MENU_LABEL_UPDATE_ASSETS                                               0x37fa42daU
+#define MENU_LABEL_VALUE_UPDATE_ASSETS                                         0x0fdf0b1bU
+
+#define MENU_LABEL_UPDATE_CHEATS                                               0x3bd5c83fU
+#define MENU_LABEL_VALUE_UPDATE_CHEATS                                         0x13ba9080U
+
+#define MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES                                  0xddfcf979U
+#define MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES                            0x6ddaf7fbU
+
+#define MENU_LABEL_UPDATE_DATABASES                                            0x158ee0cfU
+#define MENU_LABEL_VALUE_UPDATE_DATABASES                                      0x00c24d70U
+
+#define MENU_LABEL_UPDATE_OVERLAYS                                             0xd25d221cU
+#define MENU_LABEL_VALUE_UPDATE_OVERLAYS                                       0x3694fe9dU
+
+#define MENU_LABEL_UPDATE_CG_SHADERS                                           0x9473991aU
+#define MENU_LABEL_VALUE_UPDATE_CG_SHADERS                                     0x22999e5cU
+
+#define MENU_LABEL_UPDATE_GLSL_SHADERS                                         0x2413b762U
+#define MENU_LABEL_VALUE_UPDATE_GLSL_SHADERS                                   0xe2060484U
+
 #define MENU_LABEL_INFORMATION_LIST                                            0x225e7606U
 #define MENU_LABEL_VALUE_INFORMATION_LIST                                      0xd652344bU
 
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 4ceadedf46..c6ce003ecb 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -234,10 +234,13 @@ static int rarch_main_data_http_iterate_poll(http_handle_t *http)
 
    http->connection.cb     = &cb_http_conn_default;
 
+
    if (str_list->size > 1)
+   {
       strlcpy(http->connection.elem1,
             str_list->elems[1].data,
             sizeof(http->connection.elem1));
+   }
 
    string_list_free(str_list);