Flood search fixes