Adjustments to selection logic