Make advanced search consistent with usage in themes.