Improved track/artist matching