Minor update of search methond