Improving nodetree searching with support for IfNode and ForNode attributes.