Improve song sorting