Small search improvements