diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
index 5175e0096..26a283229 100644
--- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java
@@ -33,6 +33,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.TooltipCompat;
+import androidx.collection.SparseArrayCompat;
 import androidx.core.text.HtmlCompat;
 import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.ItemTouchHelper;
@@ -70,9 +71,7 @@ import org.schabi.newpipe.util.ServiceHelper;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -141,7 +140,7 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
     @State
     boolean wasSearchFocused = false;
 
-    @Nullable private Map<Integer, String> menuItemToFilterName = null;
+    private final SparseArrayCompat<String> menuItemToFilterName = new SparseArrayCompat<>();
     private StreamingService service;
     private Page nextPage;
     private boolean showLocalSuggestions = true;
@@ -426,8 +425,6 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
             supportActionBar.setDisplayHomeAsUpEnabled(true);
         }
 
-        menuItemToFilterName = new HashMap<>();
-
         int itemId = 0;
         boolean isFirstItem = true;
         final Context c = getContext();
@@ -468,11 +465,8 @@ public class SearchFragment extends BaseListFragment<SearchInfo, ListExtractor.I
 
     @Override
     public boolean onOptionsItemSelected(@NonNull final MenuItem item) {
-        if (menuItemToFilterName != null) {
-            final List<String> cf = new ArrayList<>(1);
-            cf.add(menuItemToFilterName.get(item.getItemId()));
-            changeContentFilter(item, cf);
-        }
+        final var filter = Collections.singletonList(menuItemToFilterName.get(item.getItemId()));
+        changeContentFilter(item, filter);
         return true;
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java b/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java
index 08c6366c8..50ffa2f2a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java
+++ b/app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java
@@ -1,6 +1,7 @@
 package org.schabi.newpipe.player.seekbarpreview;
 
 import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.SeekbarPreviewThumbnailType;
+import static org.schabi.newpipe.player.seekbarpreview.SeekbarPreviewThumbnailHelper.getSeekbarPreviewThumbnailType;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -8,6 +9,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.collection.SparseArrayCompat;
 
 import com.google.common.base.Stopwatch;
 
@@ -15,12 +17,9 @@ import org.schabi.newpipe.extractor.stream.Frameset;
 import org.schabi.newpipe.util.PicassoHelper;
 
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.function.Supplier;
@@ -34,18 +33,15 @@ public class SeekbarPreviewThumbnailHolder {
 
     // Key = Position of the picture in milliseconds
     // Supplier = Supplies the bitmap for that position
-    private final Map<Integer, Supplier<Bitmap>> seekbarPreviewData = new ConcurrentHashMap<>();
+    private final SparseArrayCompat<Supplier<Bitmap>> seekbarPreviewData =
+            new SparseArrayCompat<>();
 
     // This ensures that if the reset is still undergoing
     // and another reset starts, only the last reset is processed
     private UUID currentUpdateRequestIdentifier = UUID.randomUUID();
 
-    public synchronized void resetFrom(
-            @NonNull final Context context,
-            final List<Frameset> framesets) {
-
-        final int seekbarPreviewType =
-                SeekbarPreviewThumbnailHelper.getSeekbarPreviewThumbnailType(context);
+    public void resetFrom(@NonNull final Context context, final List<Frameset> framesets) {
+        final int seekbarPreviewType = getSeekbarPreviewThumbnailType(context);
 
         final UUID updateRequestIdentifier = UUID.randomUUID();
         this.currentUpdateRequestIdentifier = updateRequestIdentifier;
@@ -63,13 +59,12 @@ public class SeekbarPreviewThumbnailHolder {
         executorService.shutdown();
     }
 
-    private void resetFromAsync(
-            final int seekbarPreviewType,
-            final List<Frameset> framesets,
-            final UUID updateRequestIdentifier) {
-
+    private void resetFromAsync(final int seekbarPreviewType, final List<Frameset> framesets,
+                                final UUID updateRequestIdentifier) {
         Log.d(TAG, "Clearing seekbarPreviewData");
-        seekbarPreviewData.clear();
+        synchronized (seekbarPreviewData) {
+            seekbarPreviewData.clear();
+        }
 
         if (seekbarPreviewType == SeekbarPreviewThumbnailType.NONE) {
             Log.d(TAG, "Not processing seekbarPreviewData due to settings");
@@ -94,10 +89,8 @@ public class SeekbarPreviewThumbnailHolder {
         generateDataFrom(frameset, updateRequestIdentifier);
     }
 
-    private Frameset getFrameSetForType(
-            final List<Frameset> framesets,
-            final int seekbarPreviewType) {
-
+    private Frameset getFrameSetForType(final List<Frameset> framesets,
+                                        final int seekbarPreviewType) {
         if (seekbarPreviewType == SeekbarPreviewThumbnailType.HIGH_QUALITY) {
             Log.d(TAG, "Strategy for seekbarPreviewData: high quality");
             return framesets.stream()
@@ -111,17 +104,14 @@ public class SeekbarPreviewThumbnailHolder {
         }
     }
 
-    private void generateDataFrom(
-            final Frameset frameset,
-            final UUID updateRequestIdentifier) {
-
+    private void generateDataFrom(final Frameset frameset, final UUID updateRequestIdentifier) {
         Log.d(TAG, "Starting generation of seekbarPreviewData");
         final Stopwatch sw = Log.isLoggable(TAG, Log.DEBUG) ? Stopwatch.createStarted() : null;
 
         int currentPosMs = 0;
         int pos = 1;
 
-        final int frameCountPerUrl = frameset.getFramesPerPageX() * frameset.getFramesPerPageY();
+        final int urlFrameCount = frameset.getFramesPerPageX() * frameset.getFramesPerPageY();
 
         // Process each url in the frameset
         for (final String url : frameset.getUrls()) {
@@ -130,11 +120,11 @@ public class SeekbarPreviewThumbnailHolder {
 
             // The data is not added directly to "seekbarPreviewData" due to
             // concurrency and checks for "updateRequestIdentifier"
-            final Map<Integer, Supplier<Bitmap>> generatedDataForUrl = new HashMap<>();
+            final var generatedDataForUrl = new SparseArrayCompat<Supplier<Bitmap>>(urlFrameCount);
 
             // The bitmap consists of several images, which we process here
             // foreach frame in the returned bitmap
-            for (int i = 0; i < frameCountPerUrl; i++) {
+            for (int i = 0; i < urlFrameCount; i++) {
                 // Frames outside the video length are skipped
                 if (pos > frameset.getTotalCount()) {
                     break;
@@ -161,7 +151,9 @@ public class SeekbarPreviewThumbnailHolder {
             // Check if we are still the latest request
             // If not abort method execution
             if (isRequestIdentifierCurrent(updateRequestIdentifier)) {
-                seekbarPreviewData.putAll(generatedDataForUrl);
+                synchronized (seekbarPreviewData) {
+                    seekbarPreviewData.putAll(generatedDataForUrl);
+                }
             } else {
                 Log.d(TAG, "Aborted of generation of seekbarPreviewData");
                 break;
@@ -169,7 +161,7 @@ public class SeekbarPreviewThumbnailHolder {
         }
 
         if (sw != null) {
-            Log.d(TAG, "Generation of seekbarPreviewData took " + sw.stop().toString());
+            Log.d(TAG, "Generation of seekbarPreviewData took " + sw.stop());
         }
     }
 
@@ -189,17 +181,14 @@ public class SeekbarPreviewThumbnailHolder {
             final Bitmap bitmap = PicassoHelper.loadSeekbarThumbnailPreview(url).get();
 
             if (sw != null) {
-                Log.d(TAG,
-                        "Download of bitmap for seekbarPreview from '" + url
-                                + "' took " + sw.stop().toString());
+                Log.d(TAG, "Download of bitmap for seekbarPreview from '" + url + "' took "
+                        + sw.stop());
             }
 
             return bitmap;
         } catch (final Exception ex) {
-            Log.w(TAG,
-                    "Failed to get bitmap for seekbarPreview from url='" + url
-                            + "' in time",
-                    ex);
+            Log.w(TAG, "Failed to get bitmap for seekbarPreview from url='" + url
+                    + "' in time", ex);
             return null;
         }
     }
@@ -208,32 +197,20 @@ public class SeekbarPreviewThumbnailHolder {
         return this.currentUpdateRequestIdentifier.equals(requestIdentifier);
     }
 
-
     public Optional<Bitmap> getBitmapAt(final int positionInMs) {
-        // Check if the BitmapData is empty
-        if (seekbarPreviewData.isEmpty()) {
-            return Optional.empty();
+        // Get the frame supplier closest to the requested position
+        Supplier<Bitmap> closestFrame = () -> null;
+        synchronized (seekbarPreviewData) {
+            int min = Integer.MAX_VALUE;
+            for (int i = 0; i < seekbarPreviewData.size(); i++) {
+                final int pos = Math.abs(seekbarPreviewData.keyAt(i) - positionInMs);
+                if (pos < min) {
+                    closestFrame = seekbarPreviewData.valueAt(i);
+                    min = pos;
+                }
+            }
         }
 
-        // Get the closest frame to the requested position
-        final int closestIndexPosition =
-                seekbarPreviewData.keySet().stream()
-                        .min(Comparator.comparingInt(i -> Math.abs(i - positionInMs)))
-                        .orElse(-1);
-
-        // this should never happen, because
-        // it indicates that "seekbarPreviewData" is empty which was already checked
-        if (closestIndexPosition == -1) {
-            return Optional.empty();
-        }
-
-        try {
-            // Get the bitmap for the position (executes the supplier)
-            return Optional.ofNullable(seekbarPreviewData.get(closestIndexPosition).get());
-        } catch (final Exception ex) {
-            // If there is an error, log it and return Optional.empty
-            Log.w(TAG, "Unable to get seekbar preview", ex);
-            return Optional.empty();
-        }
+        return Optional.ofNullable(closestFrame.get());
     }
 }
diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
index 25ec87f80..dc56ee205 100755
--- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
+++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
@@ -1,5 +1,8 @@
 package us.shandian.giga.service;
 
+import static org.schabi.newpipe.BuildConfig.APPLICATION_ID;
+import static org.schabi.newpipe.BuildConfig.DEBUG;
+
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -22,12 +25,12 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.Parcelable;
 import android.util.Log;
-import android.util.SparseArray;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.collection.SparseArrayCompat;
 import androidx.core.app.NotificationCompat;
 import androidx.core.app.NotificationCompat.Builder;
 import androidx.core.app.ServiceCompat;
@@ -37,24 +40,21 @@ import androidx.preference.PreferenceManager;
 import org.schabi.newpipe.R;
 import org.schabi.newpipe.download.DownloadActivity;
 import org.schabi.newpipe.player.helper.LockManager;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-import us.shandian.giga.get.DownloadMission;
-import us.shandian.giga.get.MissionRecoveryInfo;
 import org.schabi.newpipe.streams.io.StoredDirectoryHelper;
 import org.schabi.newpipe.streams.io.StoredFileHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.PendingIntentCompat;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import us.shandian.giga.get.DownloadMission;
+import us.shandian.giga.get.MissionRecoveryInfo;
 import us.shandian.giga.postprocessing.Postprocessing;
 import us.shandian.giga.service.DownloadManager.NetworkState;
 
-import static org.schabi.newpipe.BuildConfig.APPLICATION_ID;
-import static org.schabi.newpipe.BuildConfig.DEBUG;
-
 public class DownloadManagerService extends Service {
 
     private static final String TAG = "DownloadManagerService";
@@ -95,7 +95,7 @@ public class DownloadManagerService extends Service {
     private Builder downloadDoneNotification = null;
     private StringBuilder downloadDoneList = null;
 
-    private final ArrayList<Callback> mEchoObservers = new ArrayList<>(1);
+    private final List<Callback> mEchoObservers = new ArrayList<>(1);
 
     private ConnectivityManager mConnectivityManager;
     private ConnectivityManager.NetworkCallback mNetworkStateListenerL = null;
@@ -108,7 +108,8 @@ public class DownloadManagerService extends Service {
 
     private int downloadFailedNotificationID = DOWNLOADS_NOTIFICATION_ID + 1;
     private Builder downloadFailedNotification = null;
-    private final SparseArray<DownloadMission> mFailedDownloads = new SparseArray<>(5);
+    private final SparseArrayCompat<DownloadMission> mFailedDownloads =
+            new SparseArrayCompat<>(5);
 
     private Bitmap icLauncher;
     private Bitmap icDownloadDone;
@@ -277,7 +278,7 @@ public class DownloadManagerService extends Service {
         }
 
         if (msg.what != MESSAGE_ERROR)
-            mFailedDownloads.delete(mFailedDownloads.indexOfValue(mission));
+            mFailedDownloads.remove(mFailedDownloads.indexOfValue(mission));
 
         for (Callback observer : mEchoObservers)
             observer.handleMessage(msg);
@@ -461,7 +462,7 @@ public class DownloadManagerService extends Service {
     }
 
     public void notifyFailedDownload(DownloadMission mission) {
-        if (!mDownloadNotificationEnable || mFailedDownloads.indexOfValue(mission) >= 0) return;
+        if (!mDownloadNotificationEnable || mFailedDownloads.containsValue(mission)) return;
 
         int id = downloadFailedNotificationID++;
         mFailedDownloads.put(id, mission);