diff --git a/application/controllers/CommandController.php b/application/controllers/CommandController.php
index 818030c2..8d5c2a0d 100644
--- a/application/controllers/CommandController.php
+++ b/application/controllers/CommandController.php
@@ -35,7 +35,7 @@ class CommandController extends ObjectController
             $form->loadObject($id);
         }
         $form->handleRequest();
-        $table = IcingaCommandArgumentTable::create($o);
-        $this->content()->add([$form, $table]);
+        $this->content()->add([$form]);
+        IcingaCommandArgumentTable::create($o)->renderTo($this);
     }
 }
diff --git a/library/Director/Web/Table/IcingaCommandArgumentTable.php b/library/Director/Web/Table/IcingaCommandArgumentTable.php
index 331a4458..91fa4a0d 100644
--- a/library/Director/Web/Table/IcingaCommandArgumentTable.php
+++ b/library/Director/Web/Table/IcingaCommandArgumentTable.php
@@ -12,7 +12,8 @@ class IcingaCommandArgumentTable extends ZfQueryBasedTable
     protected $command;
 
     protected $searchColumns = array(
-        'command',
+        'ca.argument_name',
+        'ca.argument_value',
     );
 
     public static function create(IcingaCommand $command)
@@ -67,6 +68,6 @@ class IcingaCommandArgumentTable extends ZfQueryBasedTable
         )->where(
             'ca.command_id = ?',
             $this->command->get('id')
-        )->order('ca.sort_order')->order('ca.argument_name');
+        )->order('ca.sort_order')->order('ca.argument_name')->limit(100);
     }
 }