Fix refined drawing and selection behavior

[#73959546]