diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 5fdaa83f8b..2dee107a43 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -16,8 +16,8 @@
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
+      "versionCode": 16,
+      "versionName": "0.4.2",
       "outputFile": "app-x86_64-release.apk"
     },
     {
@@ -25,26 +25,26 @@
       "filters": [
         {
           "filterType": "ABI",
-          "value": "x86"
+          "value": "arm64-v8a"
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
-      "outputFile": "app-x86-release.apk"
+      "versionCode": 16,
+      "versionName": "0.4.2",
+      "outputFile": "app-arm64-v8a-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
       "filters": [
         {
           "filterType": "ABI",
-          "value": "arm64-v8a"
+          "value": "x86"
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
-      "outputFile": "app-arm64-v8a-release.apk"
+      "versionCode": 16,
+      "versionName": "0.4.2",
+      "outputFile": "app-x86-release.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -55,10 +55,10 @@
         }
       ],
       "attributes": [],
-      "versionCode": 15,
-      "versionName": "0.4.1",
+      "versionCode": 16,
+      "versionName": "0.4.2",
       "outputFile": "app-armeabi-v7a-release.apk"
     }
   ],
   "elementType": "File"
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt b/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
index b8f4d78b1a..4a6ea764fd 100644
--- a/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/SearchResultFragment.kt
@@ -22,7 +22,7 @@ class SearchResultFragment : Fragment() {
     private val TAG = "SearchResultFragment"
     private lateinit var binding: FragmentSearchResultBinding
 
-    private lateinit var nextPage: String
+    private var nextPage: String? = null
     private var query: String = ""
 
     private lateinit var searchAdapter: SearchAdapter
@@ -71,7 +71,7 @@ class SearchResultFragment : Fragment() {
         binding.searchRecycler.viewTreeObserver
             .addOnScrollChangedListener {
                 if (!binding.searchRecycler.canScrollVertically(1)) {
-                    fetchNextSearchItems()
+                    if (nextPage != null) fetchNextSearchItems()
                 }
             }
     }
@@ -99,7 +99,7 @@ class SearchResultFragment : Fragment() {
                     binding.noSearchResult.visibility = View.VISIBLE
                 }
             }
-            nextPage = response.nextpage!!
+            nextPage = response.nextpage
         }
     }
 
@@ -109,7 +109,7 @@ class SearchResultFragment : Fragment() {
                 RetrofitInstance.api.getSearchResultsNextPage(
                     query,
                     apiSearchFilter,
-                    nextPage
+                    nextPage!!
                 )
             } catch (e: IOException) {
                 println(e)
diff --git a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
index 5c8c4c5384..0431263e86 100644
--- a/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
+++ b/app/src/main/java/com/github/libretube/services/BackgroundMode.kt
@@ -292,7 +292,7 @@ class BackgroundMode : Service() {
         // kill old notification
         val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
             as NotificationManager
-        notificationManager.cancel(1)
+        notificationManager.cancel(PLAYER_NOTIFICATION_ID)
     }
 
     override fun onBind(p0: Intent?): IBinder? {