Add more code for fix bugs with list one artist vs. list all artists