search fixes