diff --git a/CHANGELOG.md b/CHANGELOG.md
index 130653cbe..13bbff4e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ audio focus was lost
 
 #### Dev/Meta
 - Created new wiki with more information about app functionality
+- Switched to issue forms
 - Completed migration to reactive playback system
 - Refactor music backends into a unified chain of extractors
 - Add bluetooth connection reciever (No functionality in app yet)
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
index 8440a62c3..f17419bc9 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/CacheExtractor.kt
@@ -23,7 +23,6 @@ import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 import androidx.core.database.getIntOrNull
 import androidx.core.database.getStringOrNull
-import java.io.File
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.util.*
 
@@ -247,7 +246,7 @@ private class CacheDatabase(context: Context) :
                 cursor.getColumnIndexOrThrow(Columns.ALBUM_MUSIC_BRAINZ_ID)
             val albumNameIndex = cursor.getColumnIndexOrThrow(Columns.ALBUM_NAME)
             val albumSortNameIndex = cursor.getColumnIndexOrThrow(Columns.ALBUM_SORT_NAME)
-            val albumReleaseTypesIndex = cursor.getColumnIndexOrThrow(Columns.ALBUM_TYPES)
+            val albumTypesIndex = cursor.getColumnIndexOrThrow(Columns.ALBUM_TYPES)
 
             val artistMusicBrainzIdsIndex =
                 cursor.getColumnIndexOrThrow(Columns.ARTIST_MUSIC_BRAINZ_IDS)
@@ -284,7 +283,7 @@ private class CacheDatabase(context: Context) :
                 raw.albumMusicBrainzId = cursor.getStringOrNull(albumMusicBrainzIdIndex)
                 raw.albumName = cursor.getString(albumNameIndex)
                 raw.albumSortName = cursor.getStringOrNull(albumSortNameIndex)
-                cursor.getStringOrNull(albumReleaseTypesIndex)?.parseSQLMultiValue()?.let {
+                cursor.getStringOrNull(albumTypesIndex)?.parseSQLMultiValue()?.let {
                     raw.albumTypes = it
                 }
 
@@ -338,7 +337,7 @@ private class CacheDatabase(context: Context) :
                 put(Columns.SIZE, rawSong.size)
                 put(Columns.DURATION, rawSong.durationMs)
 
-                put(Columns.MUSIC_BRAINZ_ID, rawSong.name)
+                put(Columns.MUSIC_BRAINZ_ID, rawSong.musicBrainzId)
                 put(Columns.NAME, rawSong.name)
                 put(Columns.SORT_NAME, rawSong.sortName)
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/extractor/ParsingUtil.kt b/app/src/main/java/org/oxycblt/auxio/music/extractor/ParsingUtil.kt
index 0f9c096a2..3d6b2cc59 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/extractor/ParsingUtil.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/extractor/ParsingUtil.kt
@@ -76,7 +76,7 @@ fun String.parseTimestamp() = Date.from(this)
  * @param selector A block that determines if the string should be split at a given character.
  * @return One or more [String]s split by the selector.
  */
-inline fun String.splitEscaped(selector: (Char) -> Boolean): MutableList<String> {
+inline fun String.splitEscaped(selector: (Char) -> Boolean): List<String> {
     val split = mutableListOf<String>()
     var currentString = ""
     var i = 0