Neighborhood and NeighborhoodData fixed to work with new app