case 4344 - Standalone search markup changes.
Merge branch 'case-4344' into develop