diff --git a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt b/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
index d0d7381..bd08f2a 100644
--- a/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
+++ b/app/src/main/java/com/github/apognu/otter/activities/SearchActivity.kt
@@ -129,7 +129,6 @@ class SearchActivity : AppCompatActivity() {
     if (download.state == Download.STATE_COMPLETED) {
       download.getMetadata()?.let { info ->
         adapter.tracks.withIndex().associate { it.value to it.index }.filter { it.key.id == info.id }.toList().getOrNull(0)?.let { match ->
-          log(match)
           withContext(Dispatchers.Main) {
             adapter.tracks[match.second].downloaded = true
             adapter.notifyItemChanged(adapter.getPositionOf(SearchAdapter.ResultType.Track, match.second))
diff --git a/app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt b/app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt
index a01a30e..4fcf34e 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt
+++ b/app/src/main/java/com/github/apognu/otter/playback/MediaSession.kt
@@ -93,7 +93,7 @@ class OtterQueueNavigator : MediaSessionConnector.QueueNavigator {
     CommandBus.send(Command.NextTrack)
   }
 
-  override fun getActiveQueueItemId(player: Player?) = 0L
+  override fun getActiveQueueItemId(player: Player?) = player?.currentWindowIndex?.toLong() ?: 0
 
   override fun onSkipToPrevious(player: Player, controlDispatcher: ControlDispatcher) {
     CommandBus.send(Command.PreviousTrack)
diff --git a/app/src/main/java/com/github/apognu/otter/utils/Util.kt b/app/src/main/java/com/github/apognu/otter/utils/Util.kt
index 13edf41..f0b8da8 100644
--- a/app/src/main/java/com/github/apognu/otter/utils/Util.kt
+++ b/app/src/main/java/com/github/apognu/otter/utils/Util.kt
@@ -12,8 +12,29 @@ fun Context?.toast(message: String, length: Int = Toast.LENGTH_SHORT) {
   }
 }
 
-fun Any.log(message: Any) {
-  Log.d("OTTER", "${javaClass.simpleName}: $message")
+private fun logClassName(): String {
+  val known = setOf(
+    "dalvik.system.VMStack",
+    "java.lang.Thread",
+    "com.github.apognu.otter.utils.UtilKt"
+  )
+
+  Thread.currentThread().stackTrace.forEach {
+    if (!known.contains(it.className)) {
+      val className = it.className.split('.').last()
+      val line = it.lineNumber
+
+      return "$className:$line"
+    }
+  }
+
+  return "UNKNOWN"
+}
+
+fun Any?.log(prefix: String? = null) {
+  prefix?.let {
+    Log.d("OTTER", "${logClassName()} - $prefix: $this")
+  } ?: Log.d("OTTER", "${logClassName()} - $this")
 }
 
 fun maybeNormalizeUrl(rawUrl: String?): String? {