Improve artwork matching

using album artwork, if not available using track artwork.