Added search support. v2.3 fixes #11