Improve node matching