Small improvements to multi-instance selections