conform to changes to neighbourhood id naming