Improve find/interpolate neighbors