diff --git a/admin/inc/class.admin_cmds.inc.php b/admin/inc/class.admin_cmds.inc.php
index 6527a6c5c4..4503b506bd 100644
--- a/admin/inc/class.admin_cmds.inc.php
+++ b/admin/inc/class.admin_cmds.inc.php
@@ -50,7 +50,7 @@ class admin_cmds
 			}
 
 			$row['value'] = $cmd->value;
-			
+
 			if(method_exists($cmd, 'summary'))
 			{
 				$row['data'] = $cmd->summary();
@@ -126,11 +126,14 @@ class admin_cmds
 			0 => 'no',
 			1 => 'yes'
 		);
-		$tpl->exec('admin.admin_cmds.index',$content,array(
+		$sel_options = array(
 			'periodic' => $periodic,
 			'status' => admin_cmd::$stati,
 			'remote_id' => admin_cmd::remote_sites(),
-		),array(),$content);
+			'type' => admin_cmd::get_cmd_labels()
+		);
+
+		$tpl->exec('admin.admin_cmds.index',$content,$sel_options,array(),$content);
 	}
 
 	/**
diff --git a/admin/templates/default/cmds.xet b/admin/templates/default/cmds.xet
index c28f825dfc..61be06bc67 100644
--- a/admin/templates/default/cmds.xet
+++ b/admin/templates/default/cmds.xet
@@ -15,11 +15,15 @@
 				<column width="30%" minWidth="120"/>
 				<column/>
 				<column/>
+				<column/>
+				<column/>
 			</columns>
 			<rows>
 				<row class="th">
 					<nextmatch-header label="Title" id="title"/>
-					<nextmatch-header label="Requested" id="requested"/>
+					<nextmatch-filterheader empty_label="Type" id="type"/>
+					<nextmatch-accountfilter empty_label="Requested" id="requested"/>
+					<nextmatch-header label="Comment" id="comment"/>
 					<nextmatch-sortheader label="Scheduled" id="scheduled"/>
 					<nextmatch-filterheader empty_label="Periodic" id="periodic"/>
 					<nextmatch-filterheader options="Remote" id="remote_id"/>
@@ -31,7 +35,9 @@
 				</row>
 				<row class="row $row_cont[class]">
 					<description id="${row}[title]" statustext="$row_cont[data]"/>
+					<select id="${row}[type]" readonly="true"/>
 					<url-email id="${row}[requested_email]" readonly="true" statustext="$row_cont[comment]"/>
+					<description id="${row}[comment]"/>
 					<date-time id="${row}[scheduled]" readonly="true"/>
 					<description id="${row}[rrule]"/>
 					<select id="${row}[remote_id]" readonly="true"/>