t2u: Fix key selection

Ian Jacksonrequested to merge
key-selection into master

Fixes #54 (closed)

Draft because my local tests are running.

Merge request reports