fix escaping issue for clients
fix escaping issue in webclient