fix keyboard shortcuts + fix key event filter