Added types to factor filter set.