Slightly better search

Closes #443