Fix the last of the bad requests.  Tweaks to album matching.