KEYG and KEYX

Improvement so that taking the key label from X, not from K.

This issue was reported at https://forum.swissmicros.com/viewtopic.php?p=25220#p25220