Added minor improvement for saddleback search