WP-2505: Move term filters to secondary section.
WP-2505: Remove OR filter logic, just use AND.