Search feature bugfix. Fixes #92