Add more error definitions for "search" command and around the message itself.