WP-2505: Remove OR filter logic, just use AND.