Fix a couple bugs in search.
Use more messages.