improve performance for selection tools with modes