fixed watch-currentArtist
merged with master