Adjust location field

And avoid override on the neighborhood field