Basic search support, fixes #15