More search logic