Finished handling of selections using keys as well