Improve path selection in generator

+ filter out generic trees