Move neighborhood lookup to the API