Fixes for search error messaging
Merge pull request #504 from nla/ti_search_fixes

Fixes for search error messaging