Temp fix so it works with either artist or album empty. Needs major refactoring.