Support searching for plot/tree subsets
Add missing factor