Two search fixes