Changes to enable node search in neighbour servers