add convenience method, enhance client search API

Change-Id: Icf6a88c4faf09191b42e19590a1b615ee0a4f8d6