diff --git a/admin/inc/class.admin_cmd.inc.php b/admin/inc/class.admin_cmd.inc.php
index d727a12346..9b36731eac 100644
--- a/admin/inc/class.admin_cmd.inc.php
+++ b/admin/inc/class.admin_cmd.inc.php
@@ -512,6 +512,10 @@ abstract class admin_cmd
 			$query['col_filter'][] = 'cmd_rrule IS NOT NULL';
 		}
 		unset($query['col_filter']['periodic']);
+		if($query['parent_id'])
+		{
+			$query['col_filter']['parent'] = (int)$query['parent_id'];
+		}
 
 		$total = admin_cmd::$sql->get_rows($query,$rows,$readonlys);
 
@@ -1113,7 +1117,11 @@ abstract class admin_cmd
 		// instanciate single periodic execution object
 		$single = $cmd->as_array();
 		$single['parent'] = $single['id'];
-		unset($single['id'], $single['uid'], $single['rrule'], $single['created'], $single['modified'], $single['modifier'], $single['async_job_id']);
+		unset($single['id'], $single['uid'], $single['rrule'], $single['created'],
+				$single['modified'], $single['modifier'],
+		//		$single['set'], $single['old'],
+				$single['async_job_id']
+		);
 		$periodic = admin_cmd::instanciate($single);
 
 		try {