Check whether albumartist is blank before trying to add it.
Only add albumartist if it's non-empty
Use album-artist if available.