Small performance improvements for live neighborhood finder