added search via 2i and tests.