Search tweaks.

Closes #153.