More matching fixes, was getting the wrong song quite often
because we were just taking the last match (and not checking artist)