Search

Fixes #1489