Improve clients search