Add search improvements