Comment updates.
Simplify search_form_category_selector.