Improve HS_ClientManager and fix issue

No match.