Fixing search

Fixes #72