R4: Improved playlist behaviour