Search Logic Fix