Song without album fix

Another set of small fixes to fixup some music non-musicbrainz uses ;-)