bug fix and improve node locator