More consistency for assets and helpers. Also added select_tree @vjt