WP-4141: updat search markup.