some search fixes