Overhaul client search model.