Now uses artist if no album artist