Fix advanced search form after 3.3 rebase.