diff --git a/lua/browser.lua b/lua/browser.lua
index d4fe759f..a83a26c4 100644
--- a/lua/browser.lua
+++ b/lua/browser.lua
@@ -94,9 +94,9 @@ return screen:new {
     end
 
     local get_icon_func = nil
-    local show_listened = self.mediatype == database.MediaTypes.Audiobook or
+    local longform_content = self.mediatype == database.MediaTypes.Audiobook or
     self.mediatype == database.MediaTypes.Podcast
-    if show_listened then
+    if longform_content then
       get_icon_func = function(item)
         local contents = item:contents()
         if type(contents) == "userdata" then
@@ -128,7 +128,7 @@ return screen:new {
           else
             queue.clear()
             local track = database.track_by_id(contents)
-            if (track) then
+            if (track and longform_content) then
               queue.play_from(track.filepath, track.saved_position)
             else
               queue.add(contents)
diff --git a/src/tangara/audio/audio_fsm.cpp b/src/tangara/audio/audio_fsm.cpp
index c6ac75f0..027b3783 100644
--- a/src/tangara/audio/audio_fsm.cpp
+++ b/src/tangara/audio/audio_fsm.cpp
@@ -426,7 +426,7 @@ auto AudioState::updateTrackData(std::string uri,
 auto AudioState::updateSavedPosition(std::string uri, uint32_t position)
     -> void {
   updateTrackData(
-      uri, [&](database::TrackData& data) { data.last_position = position; });
+      uri, [=](database::TrackData& data) { data.last_position = position; });
 }
 
 auto AudioState::incrementPlayCount(std::string uri) -> void {