Fix management of key input with tagging activated