Small name changes in SupportSearchForm