* Fix the merge field tree selection so that attributes are not added to every node and collection items are rendered correctly