CON-2104: Fixes for node finder