Add search helper. Fixes #6