Add search method support on cli/srv. Many improvments.