Search improvements.