Fix node tag generation