Refactor ClientRange

and re-enable client search.