More search cleanup