WP-3601 Added filter on product_type