case 2970 - Fixes to meet latest changes.
case 2970 - Correct ting object type check.
Merge branch 'case-2970' into new-search