#38: Improved node selection