diff --git a/app/src/main/java/xyz/btcland/libretube/SearchFragment.kt b/app/src/main/java/xyz/btcland/libretube/SearchFragment.kt
index 4efaae1b8..d3081651d 100644
--- a/app/src/main/java/xyz/btcland/libretube/SearchFragment.kt
+++ b/app/src/main/java/xyz/btcland/libretube/SearchFragment.kt
@@ -64,7 +64,7 @@ class SearchFragment : Fragment() {
 
                 override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
                     if(s!! != ""){
-                        GlobalScope.launch {
+                        lifecycleScope.launchWhenCreated {
                             fetchSuggestions(s.toString(), autoTextView)
                             delay(2000)
                             fetchSearch(s.toString())
@@ -111,7 +111,9 @@ class SearchFragment : Fragment() {
                 Log.e(TAG, "HttpException, unexpected response")
                 return@launchWhenCreated
             }
-            print(response!!.items!![0])
+            if(response.items!!.isNotEmpty()){
+                print(response!!.items!![0])
+            }
         }
     }
     companion object {
diff --git a/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt b/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt
index 764a602d3..8618dde6e 100644
--- a/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt
+++ b/app/src/main/java/xyz/btcland/libretube/TrendingAdapter.kt
@@ -1,6 +1,5 @@
 package xyz.btcland.libretube
 
-import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -11,8 +10,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.squareup.picasso.Picasso
 import xyz.btcland.libretube.obj.StreamItem
-import java.math.BigDecimal
-import java.math.RoundingMode
 
 class TrendingAdapter(private val videoFeed: List<StreamItem>): RecyclerView.Adapter<CustomViewHolder>() {
     override fun getItemCount(): Int {
@@ -28,7 +25,7 @@ class TrendingAdapter(private val videoFeed: List<StreamItem>): RecyclerView.Ada
     override fun onBindViewHolder(holder: CustomViewHolder, position: Int) {
         val trending = videoFeed[position]
         holder.v.findViewById<TextView>(R.id.textView_title).text = trending.title
-        holder.v.findViewById<TextView>(R.id.textView_channel).text = trending.uploaderName +" • "+ videoViews(trending.views)+" • "+trending.uploadedDate
+        holder.v.findViewById<TextView>(R.id.textView_channel).text = trending.uploaderName +" • "+ trending.views.videoViews()+" • "+trending.uploadedDate
         val thumbnailImage = holder.v.findViewById<ImageView>(R.id.thumbnail)
         val channelImage = holder.v.findViewById<ImageView>(R.id.channel_image)
         channelImage.setOnClickListener{
@@ -57,23 +54,4 @@ class TrendingAdapter(private val videoFeed: List<StreamItem>): RecyclerView.Ada
 class CustomViewHolder(val v: View): RecyclerView.ViewHolder(v){
     init {
     }
-}
-fun videoViews(views: Long?): String{
-    when {
-        views!!<1000 -> {
-            return views.toString()
-        }
-        views in 1000..999999 -> {
-            val decimal = BigDecimal(views/1000).setScale(0, RoundingMode.HALF_EVEN)
-            return decimal.toString()+"K"
-        }
-        views in 1000000..10000000 -> {
-            val decimal = BigDecimal(views/1000000).setScale(0, RoundingMode.HALF_EVEN)
-            return decimal.toString()+"M"
-        }
-        else -> {
-            val decimal = BigDecimal(views/1000000).setScale(0, RoundingMode.HALF_EVEN)
-            return decimal.toString()+"M"
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/xyz/btcland/libretube/VideoViews.kt b/app/src/main/java/xyz/btcland/libretube/VideoViews.kt
new file mode 100644
index 000000000..9a3af9824
--- /dev/null
+++ b/app/src/main/java/xyz/btcland/libretube/VideoViews.kt
@@ -0,0 +1,22 @@
+package xyz.btcland.libretube
+
+import java.math.BigDecimal
+import java.math.RoundingMode
+
+fun Long?.videoViews(): String = when {
+                                            this!!<1000 -> {
+                                                this.toString()
+                                            }
+                                            this in 1000..999999 -> {
+                                                val decimal = BigDecimal(this/1000).setScale(0, RoundingMode.HALF_EVEN)
+                                                decimal.toString()+"K"
+                                            }
+                                            this in 1000000..10000000 -> {
+                                                val decimal = BigDecimal(this/1000000).setScale(0, RoundingMode.HALF_EVEN)
+                                                decimal.toString()+"M"
+                                            }
+                                            else -> {
+                                                val decimal = BigDecimal(this/1000000).setScale(0, RoundingMode.HALF_EVEN)
+                                                decimal.toString()+"M"
+                                            }
+                                        }