Fixes for search error messaging
Fixes for items 2,3,4 for DSC-341
Merge pull request #504 from nla/ti_search_fixes

Fixes for search error messaging
Merge pull request #505 from nla/ti_work_copy_defects

Fixes for items 2,3,4 for DSC-341
Merge remote-tracking branch 'origin/master' into dsc-238
merged in latest changes.