now that they are both in a single entry and no choice is needed --  I still wonder if those shold not become a part of filter definition?
Or do you see them differing much on different distributions/releases so would not be able to cover them all somehow?