case 3557 - Fix for search term rule.
Merge branch 'case-3557' into develop