Fix key shortcut and bug in analytics