SearchForm menu reorganization