diff --git a/solvable/src/event_handler_main.py b/solvable/src/event_handler_main.py
index c67647a..573dd18 100644
--- a/solvable/src/event_handler_main.py
+++ b/solvable/src/event_handler_main.py
@@ -17,19 +17,19 @@ def cenator(history):
 
 class TestCommands(TerminalCommands):
     def command_selectdir(self, *args):
-        TFWServerConnector().send_to_eventhandler('webide',
-                                                  {'data': {'command': 'selectdir',
+        TFWServerConnector().send_to_eventhandler({'key': 'webide',
+                                                   'data': {'command': 'selectdir',
                                                             'directory': args[0]}})
 
     def command_trigger(self, *args):
-        TFWServerConnector().send('selectdir_needs_no_key',
-                                  {'trigger': args[0]})
+        TFWServerConnector().send({'key': '',
+                                   'trigger': args[0]})
 
     def command_togglenext(self, *args):
         if not hasattr(self, 'togglenext_visible'):
             self.togglenext_visible = True
-        TFWServerConnector().send('messagecontrol',
-                                  {'data': {'command': 'showbutton',
+        TFWServerConnector().send({'key': 'messagecontrol',
+                                   'data': {'command': 'showbutton',
                                             'next_visibility': self.togglenext_visible}})
         self.togglenext_visible = not self.togglenext_visible