Refactor - get_product_search_form().

Also removed < 2.1 deprecated filter mapping.

Closes #4444