Hi, there is an error present in your edits around here, highway intersections and highway intersections with waterways don't have a common node.

It's easy to see here
https://keepright.at/report_map.php?zoom=14&lat=48.20808&lon=16.37221

When highways intersect they should always have a node at intersection and for waterways you have to see if the water you should check if you should add a tunnel for a waterway.