unify search method in one CR: ? :/