make search configuratable

Change-Id: I7c3beb895de449669f228e3f80c1d79dfee0dd3a