3 files changed, 7 insertions, 5 deletions

diff --git a/apps/plugins/lib/mul_id3.c b/apps/plugins/lib/mul_id3.c
index c40a495ecd..edf44f7282 100644
--- a/apps/plugins/lib/mul_id3.c
+++ b/apps/plugins/lib/mul_id3.c
@@ -135,7 +135,7 @@ void collect_id3(struct mp3entry *id3, bool is_first_track)
  *     - Unit for length will be s instead of ms
  *
  *     Use result only as input for browse_id3,
- *     and set multiple_tracks parameter to true.
+ *     with the track_ct parameter set to  > 1.
  */
 void finalize_id3(struct mp3entry *id3)
 {
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index 52f87355b2..b884f3ae0f 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -4027,7 +4027,7 @@ static int show_id3_info(const char *selected_file)
     if (is_multiple_tracks)
         finalize_id3(&id3);
 
-    return rb->browse_id3(&id3, 0, 0, NULL, i > 1) ? PLUGIN_USB_CONNECTED : 0;
+    return rb->browse_id3(&id3, 0, 0, NULL, i) ? PLUGIN_USB_CONNECTED : 0;
 }
 
 
diff --git a/apps/plugins/properties.c b/apps/plugins/properties.c
index 638d7380a5..53af4c5bab 100644
--- a/apps/plugins/properties.c
+++ b/apps/plugins/properties.c
@@ -446,9 +446,11 @@ enum plugin_status plugin_start(const void* parameter)
     FOR_NB_SCREENS(i)
         rb->viewportmanager_theme_enable(i, true, NULL);
 
-    bool usb =  props_type == PROPS_ID3 ?     rb->browse_id3(&id3, 0, 0, &tm, false)  :
-               (props_type == PROPS_MUL_ID3 ? rb->browse_id3(&id3, 0, 0, NULL, mul_id3_count > 1) :
-                                              browse_file_or_dir(&stats));
+    bool usb =  props_type == PROPS_ID3 ?     rb->browse_id3(&id3, 0, 0, &tm, 1)  :
+#ifdef HAVE_TAGCACHE
+                props_type == PROPS_MUL_ID3 ? rb->browse_id3(&id3, 0, 0, NULL, mul_id3_count) :
+#endif
+                                              browse_file_or_dir(&stats);
 
     FOR_NB_SCREENS(i)
         rb->viewportmanager_theme_undo(i, false);