Node finder enhancements