More search fixes