Improve search()