Remove block from super
Merge pull request #18166 from merongivian/search_field_refactor

Remove block from super