Fixes #168

Search should work correctly now