More fixes on redirection after watchlist removal