Merge pull request #17975 from merongivian/add_test_for_search_field

Fix options overwritten by super