Fixes for search error messaging

In response to DSC-374