diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html
index 749f19f6..e604bc97 100644
--- a/app/src/main/assets/changelog.html
+++ b/app/src/main/assets/changelog.html
@@ -31,8 +31,12 @@
     <li><b>IMPROVEMENT:</b> Increased album cover quality when selecting the "ignore media store
         covers" option.
     </li>
+    <li><b>REVERT:</b> Brought back the "Tag editor" label to the song tag editor.
+    </li>
     <li><b>FIX:</b> Last song in the song view not showing up.
     </li>
+    <li><b>FIX:</b> Favorites playlist heart icon not showing up when initially added until restart.
+    </li>
     <li><b>FIX:</b> Hopefully fixed the bug where the alternative progress slider always stayed
         black on some devices. Please report if the bug is fixed at the <a
                 href="https://plus.google.com/u/0/communities/106227738496107108513">Google+
diff --git a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
index 8393af5b..377b1a16 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/adapter/PlaylistAdapter.java
@@ -64,6 +64,7 @@ public class PlaylistAdapter extends AbsMultiSelectAdapter<PlaylistAdapter.ViewH
 
     public void swapDataSet(ArrayList<Playlist> dataSet) {
         this.dataSet = dataSet;
+        favoritePlaylistId = MusicUtil.getFavoritesPlaylist(activity).id;
         notifyDataSetChanged();
     }
 
diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
index 20f8e4da..9186d2c7 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/SongTagEditorActivity.java
@@ -44,6 +44,9 @@ public class SongTagEditorActivity extends AbsTagEditorActivity implements TextW
 
         setNoImageMode();
         setUpViews();
+
+        //noinspection ConstantConditions
+        getSupportActionBar().setTitle(R.string.action_tag_editor);
     }
 
     private void setUpViews() {