Refactoring: Better code

4 jobs for 1263-fix-subsonic-duplicated-playlist in 12 minutes and 37 seconds (queued for 3 seconds)