ref #8385: better handling of distr preferences and term related preferences