diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs
index cffff695..2f1b9b36 100644
--- a/PARR.API/Controllers/V1/RobotTaskController.cs
+++ b/PARR.API/Controllers/V1/RobotTaskController.cs
@@ -63,14 +63,14 @@ namespace PARR.API.Controllers.V1
                     // шаблоны
                     query = query.Include(t => t.Template)
                                         .ThenInclude(t => t!.Host).ThenInclude(t => t!.ResponseArea)
-                                        .ThenInclude(t => t!.Hosts).ThenInclude(t => t.WorkGroup)
+                                        .ThenInclude(t => t!.Hosts).ThenInclude(t => t.WorkGroup).ThenInclude(t => t!.ResponseArea)
                                     .Include(t => t.Template)
                                         .ThenInclude(a => a!.ApplicationsInWork)
                                         .ThenInclude(w => w!.Work)
                                         .ThenInclude(t => t!.Tnk)
                                         .ThenInclude(s => s!.Subprocess)
                                         .ThenInclude(p => p!.Process);
-                                    //.AsSplitQuery();
+                    //.AsSplitQuery();
                     break;
                 case RobotsEnum.ScheduleOrder:
                     //расписание
@@ -159,7 +159,7 @@ namespace PARR.API.Controllers.V1
                     logger.LogDebug($"Для appilcationInWork id {task.Template.ApplicationInWorkId}, шаблона id {task.TemplateId} обновляю lastRun, новое значение {appInWorks.NextRun}, старое значение {appInWorks.LastRun}");
                     appInWorks.LastRun = appInWorks.NextRun;
                 }
-                
+
                 appInWorks.NextRun = nextRun;
 
                 await robotConfigurationService.CommitAsync();
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index ff20b6c7..10f8faf2 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -131,11 +131,12 @@ namespace PARR.API.MappingProfiles
             CreateMap<RobotConfiguration, RobotTaskTemplateResponse>()
                 .ForMember(d => d.IsActive, o => o.MapFrom(s => s.Template!.IsActiveTemplate))
                 .ForMember(d => d.ClosingCode, o => o.MapFrom<RobotTaskTemplateClosingCodeResolver>())
-                //todo
                 .ForMember(d => d.FullDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.FullDescription))
                 .ForMember(d => d.ShortDescription, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.ShortDescription))
                 .ForMember(d => d.Solution, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Solution))
-                .ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name))
+                 //.ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.ResponseArea!.Name))
+                 //ЗО берем у группы а не у хоста
+                 .ForMember(d => d.ResponseArea, o => o.MapFrom(s => s.Template!.Host!.WorkGroup!.ResponseArea!.Name))
                 .ForMember(d => d.TemplateDuration, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.TemplateDuration))
                 .ForMember(d => d.Initiator, o => o.MapFrom<RobotTaskTemplateInitiatorResolver>())
                 .ForMember(d => d.Category, o => o.MapFrom<RobotTaskTemplateCategoryResolver>())
@@ -148,8 +149,6 @@ namespace PARR.API.MappingProfiles
                 .ForMember(d => d.SubprocessEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Subprocess!.EsppId))
                 .ForMember(d => d.TnkName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.Name.ApplyShortcode(Shortcodes.EK, s.Template!.Host!.Ek)))
                 .ForMember(d => d.TnkEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Tnk!.EsppId))
-                //.ForMember(d => d.WorkName, o => o.MapFrom(s =>  s.Template!.ApplicationsInWork!.Work!.Name))
-                // .ForMember(d => d.WorkName, o => o.MapFrom(s => ShortcodeHelpers.ApplyShortcode(Shortcodes.EK, s.Template.Host.Ek, ref s.Template!.ApplicationsInWork!.Work!.Name.ToString())))
                 .ForMember(d => d.WorkName, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.Name.ApplyShortcode(Shortcodes.EK, s.Template!.Host!.Ek)))
                 .ForMember(d => d.WorkEsppId, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.Work!.EsppId));