[Sahi] Improvements for selection operation