improve default key tag & fix key checkboxes on key add