[FIX][T7583] Fix filter all product types

Merged diego.barreto requested to merge T7117 into 12.0

Merge request reports