Made graph search and baseline object search guarded.