search fixes+