Nodes with tags2

Reimplemented on top of current master