infinity search fixes