search improvements
search improvements