Final fixes for social-watch-lists