Fix country/artist models