Added an option for artist_limit