Tweaked search algo for better results.