Previously inherited/direct and two factor filters could not be
combined. This adds support for combining those two filters