Some adjustments to selectionLimiter