More intelligent setting of filename

Only add artist, if not contained already in title.