Selection logic tweak