Latest search fixes