diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b0d3bb16..951fe49f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 at the cost of longer loading times
 	- Added support for sort tags [#172, dependent on this feature]
 	- Added support for date tags, including more fine-grained dates [#159, dependent on this feature]
+	- Added support for release types signifying EPs/Singles [#158, dependent on this feature]
 - Added Last Added sorting
 - Search now takes sort tags and file names in account [#184]
 
diff --git a/README.md b/README.md
index fecb311f8..d0346a8f2 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ I primarily built Auxio for myself, but you can use it too, I guess.
 - Opinionated UX that prioritizes ease of use over edge cases
 - Customizable behavior
 - Advanced media indexer that prioritizes correct metadata
+- Precise Dates, Sort Tags, and Release Type support (If enabled)
 - SD Card-aware folder management
 - Reliable playback state persistence
 - Full ReplayGain support (On MP3, MP4, FLAC, OGG, and OPUS)
@@ -57,7 +58,6 @@ I primarily built Auxio for myself, but you can use it too, I guess.
 
 ## To come in the future:
 
-- Even better metadata support
 - Playlists
 - Liked songs
 - Artist Images
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt b/app/src/main/java/org/oxycblt/auxio/playback/BottomSheetLayout.kt
similarity index 99%
rename from app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
rename to app/src/main/java/org/oxycblt/auxio/playback/BottomSheetLayout.kt
index ed0768d5a..0c754d70e 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/BottomSheetLayout.kt
+++ b/app/src/main/java/org/oxycblt/auxio/playback/BottomSheetLayout.kt
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.auxio.ui
+package org.oxycblt.auxio.playback
 
 import android.content.Context
 import android.graphics.Canvas
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 2235edfac..9e1475916 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <org.oxycblt.auxio.ui.BottomSheetLayout
+    <org.oxycblt.auxio.playback.BottomSheetLayout
         android:id="@+id/bottom_sheet_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </org.oxycblt.auxio.ui.BottomSheetLayout>
+    </org.oxycblt.auxio.playback.BottomSheetLayout>
 
     <FrameLayout
         android:id="@+id/layout_too_small"
diff --git a/info/FAQ.md b/info/FAQ.md
index e3d268b87..88bc7697c 100644
--- a/info/FAQ.md
+++ b/info/FAQ.md
@@ -20,46 +20,57 @@ MP4, MP3, MKA, OGG, WAV, MPEG, AAC on all versions of Android. Auxio also suppor
 of Android through the use of the ExoPlayer FLAC extension.
 
 #### Auxio doesn't load my music correctly!
-This is probably caused by one of two reasons:
-1. If other players like Phonograph, Retro Music, or Music Player GO load it correctly, then Auxio has a bug and it should be [reported](https://github.com/OxygenCobalt/Auxio/issues).
-2. If the aforementioned players don't work, but players like Vanilla Music and VLC do, then it's a problem with the Media APIs that Auxio relies on. There is nothing I can do about it.
-	- I hope to mitigate these issues in the future by extracting metadata myself or adding Subsonic/SoundPod support, however this is extremely far off.
+This depends on the context:
+1. If "Ignore MediaStore Tags" is enabled, please file an issue with your particular issue.
+2. If "Ignore MediaStore Tags" is not enabled, please check below to make sure your issue is not already
+awknowledged before reporting an issue.
 
-Some common issues are listed below.
+Moreso, if the issue encountered does not appear in other apps like Music Player GO, Phonograph,
+Vinyl, Retro Music, VLC, or Vanilla, then it should be reported.
 
-#### My FLAC/OGG/OPUS files don't have dates!
-Android does not read the `DATE` tag from vorbis files. It reads the `YEAR` tag. This is because android's metadata parser is
+***Known unfixable music loading issues***
+
+These are a list of unfixable music loading issues that can only be fixed by enabling "Ignore MediaStore Tags":
+
+**My FLAC/OGG/OPUS files don't have dates:** Android does not read the `DATE` tag from vorbis files. It reads the `YEAR` tag. This is because android's metadata parser is
 stuck in 2008.
 
-#### Some files with accented/symbolic characters have corrupted tags!
-When Android extracts metadata, at some point it tries to convert the bytes it extracted to a java string, which apparently involves detecting the encoding of the data dynamically and
-then converting it to Java's Unicode dialect. Of course, trying to detect codings on the fly like that is a [terrible idea](https://en.wikipedia.org/wiki/Bush_hid_the_facts), and more
-often than not it results in UTF-8 tags (Seen on FLAC/OGG/OPUS files most often) being corrupted. 
+**Some files with accented/symbolic characters have corrupted tags:** When Android extracts metadata, at some point it tries to convert the bytes it extracted to a
+java string, which apparently involves detecting the encoding of the data dynamically and then converting it to Java's Unicode dialect. Of course, trying to detect
+codings on the fly like that is a [terrible idea](https://en.wikipedia.org/wiki/Bush_hid_the_facts), and more often than not it results in UTF-8 tags (Seen on
+FLAC/OGG/OPUS files most often) being corrupted.
 
-#### I have a large library and Auxio takes really long to load it!
-This is expected since reading from the audio database takes awhile, especially with libraries containing 10k songs or more.
+**I have a large library and Auxio takes really long to load it:** This is expected since reading from the audio database takes awhile, especially with libraries
+containing 10k songs or more.
 
-#### Auxio does not detect new music!
-This is Auxio's default behavior due to limitations regarding android's filesystem APIs. To enable such behavior, turn on
+**Auxio does not detect disc numbers:** If your device runs Android 10, then Auxio cannot parse a disc from the media database due to
+a regression introduced by Google in that version. If this issue appears in another android version, please file an issue. 
+
+***Other music loading issues***
+
+**There should be one artist, but instead I get a bunch of "Artist & Collaborator" artists:** This likely means your tags are wrong. By default, Auxio will use the
+"album artist" tag for grouping if present, falling back to the "artist" tag otherwise. If your music does not have such a field, it will result in fragmented artists.
+The reason why Auxio does not simply parse for separators and then extract artists that way is that it risks mangling artists that don't actually have collaborators,
+such as "Black Country, New Road" becoming "Black Country".
+
+**Auxio does not detect new music:** This is Auxio's default behavior due to limitations regarding android's filesystem APIs. To enable such behavior, turn on
 "Automatic reloading" in settings. Note that this option does require a persistent notification and higher battery usage.
 
+#### Why are my songs/albums/artists out of order?
+Auxio takes sort tags (like `TSOT` or `TITLESORT`) into account when sorting, which could cause items to
+appear in unexpected places. If your items do not have sort tags, please file an issue.
+
+#### Why does search return songs that don't match my query?
+Auxio actually takes several types of metadata in account in searching:
+- The name, normalized so that any accented/symbolic characters are converted to normal characters. For example, Ü -> U.
+- The sort tag of a particular song/album/artist, as such often contain latinized/translated versions of a given title.
+- The file name, as some users don't have usable title metadata, and instead use the file name as the title.
+
 #### Why does playback pause whenever music is reloaded?
 Whenever the music library signifigantly changes, updating the player's data while it is still playing may result in
 unwanted bugs or unexpected music playing. To safeguard against this, Auxio will pause whenever it reloads a new
 music library. 
 
-#### There should be one artist, but instead I get a bunch of "Artist & Collaborator" artists!
-This likely means your tags are wrong. By default, Auxio will use the "album artist" tag for
-grouping if present, falling back to the "artist" tag otherwise. If your music does not have
-such a field, it will result in fragmented artists. The reason why Auxio does not simply parse
-for separators and then extract artists that way is that it risks mangling artists that don't
-actually have collaborators, such as "Black Country, New Road" becoming "Black Country".
-
-#### Why does Auxio not detect disc numbers on my device?
-If your device runs Android 10, then Auxio cannot parse a disc from the media database due to
-a regression introduced by Google in that version. If your device is running another version,
-please file an issue.
-
 #### ReplayGain isn't working on my music!
 This is for a couple reason:
 - Auxio doesn't extract ReplayGain tags for your format. This is a problem on ExoPlayer's end and should be