Moved KeyHandler to Handlers filter