More search improvements