+ More search fixes