Better handling of square brackets in song names