WP-2370: Remove hardcoded filter and allow multiple values.