Fixed song format issues with streaming
Merge branch 'hotfix'