Fixed issues when using WebFilter with client.