Updates for the search.

Apparently I missed committing a lot of things yesterday.