fixed setlist data issue with picker
merge