Overall search fixes