search improvements for #1