More select button fixes