diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 46fa637174..0e805cb5fc 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -895,7 +895,7 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
     * treatment, since the label has the format:
     *   <MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL>|<entry_name>
     * i.e. cannot use a normal string_is_equal() */
-   if (strstr(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL)))
+   if (string_starts_with(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL)))
    {
       BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_entry_detail);
    }
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 2fc1f61b92..8629749820 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -10570,7 +10570,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
          {
             menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 
-            if (strstr(info->path, "core_option_"))
+            if (string_starts_with(info->path, "core_option_"))
             {
                struct string_list *tmp_str_list = string_split(info->path, "_");
 
@@ -10988,7 +10988,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
       case DISPLAYLIST_DROPDOWN_LIST_SPECIAL:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
 
-         if (strstr(info->path, "core_option_"))
+         if (string_starts_with(info->path, "core_option_"))
          {
             struct string_list *tmp_str_list = string_split(info->path, "_");
 
diff --git a/menu/menu_networking.c b/menu/menu_networking.c
index d4f107622d..4d8d56d527 100644
--- a/menu/menu_networking.c
+++ b/menu/menu_networking.c
@@ -152,7 +152,8 @@ void cb_net_generic_subdir(retro_task_t *task,
    subdir_path[data->len] = '\0';
 
 finish:
-   if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
+   if (!err && !string_ends_with(subdir_path,
+            file_path_str(FILE_PATH_INDEX_DIRS_URL)))
    {
       char parent_dir[PATH_MAX_LENGTH];
 
@@ -219,7 +220,8 @@ finish:
       free(data);
    }
 
-   if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
+   if (!err && 
+         !string_ends_with(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
    {
       char *parent_dir                 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
       char *parent_dir_encoded         = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
diff --git a/tasks/task_http.c b/tasks/task_http.c
index 3a76545963..415591b520 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -353,7 +353,7 @@ void* task_push_http_transfer_file(const char* url, bool mute,
    strlcpy(tmp, msg_hash_to_str(MSG_DOWNLOADING), sizeof(tmp));
    strlcat(tmp, " ", sizeof(tmp));
 
-   if (strstr(s, ".index"))
+   if (string_ends_with(s, ".index"))
       strlcat(tmp, msg_hash_to_str(MSG_INDEX_FILE), sizeof(tmp));
    else
       strlcat(tmp, s, sizeof(tmp));