Drastically simplify Search Status code.