Updated to deal with cases where artist prefixes have been stripped