Changes option to allow any specified key to be used for selection

As discussed.