diff --git a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
index faed43f..e2d2169 100644
--- a/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
+++ b/Marco.Pms.Model/ViewModels/Activities/TaskVM.cs
@@ -16,7 +16,7 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public WorkItem WorkItem { get; set; }
         public string Tenant { get; set; }
         
-        public List<TaskComment> Comments { get; set; }
+        public List<CommentVM> Comments { get; set; }
         public List<EmployeeVM> TeamMembers { get; set; }
     }
 }
diff --git a/Marco.Pms.Services/Controllers/ProjectController.cs b/Marco.Pms.Services/Controllers/ProjectController.cs
index 67af3a6..b738932 100644
--- a/Marco.Pms.Services/Controllers/ProjectController.cs
+++ b/Marco.Pms.Services/Controllers/ProjectController.cs
@@ -453,7 +453,7 @@ namespace MarcoBMS.Services.Controllers
                     };
                     workItems.Add(result);
                 }
-
+                var activity = await _context.ActivityMasters.ToListAsync();
                 return Ok(ApiResponse<object>.SuccessResponse(workItems, "Data saved successfully.", 200));
             }
 
diff --git a/Marco.Pms.Services/Controllers/TaskController.cs b/Marco.Pms.Services/Controllers/TaskController.cs
index 34a94d7..f7eb3f3 100644
--- a/Marco.Pms.Services/Controllers/TaskController.cs
+++ b/Marco.Pms.Services/Controllers/TaskController.cs
@@ -14,9 +14,10 @@ using Microsoft.EntityFrameworkCore;
 
 namespace MarcoBMS.Services.Controllers
 {
-    [Authorize]
+    
     [Route("api/[controller]")]
     [ApiController]
+    [Authorize]
     public class TaskController : ControllerBase
     {
         private readonly ApplicationDbContext _context;
@@ -177,15 +178,15 @@ namespace MarcoBMS.Services.Controllers
             idList = workAreas.Select(a => a.Id).ToList();
 
             List<WorkItem> workItems = await _context.WorkItems.Where(i => idList.Contains(i.WorkAreaId) && i.TenantId == tenantId).Include(i => i.ActivityMaster).ToListAsync();
-            idList = workAreas.Select(i => i.Id).ToList();
+            idList = workItems.Select(i => i.Id).ToList();
 
             List<TaskAllocation> taskAllocations = await _context.TaskAllocations.Where(t => idList.Contains(t.WorkItemId) && t.AssignmentDate >= fromDate && t.AssignmentDate <= toDate && t.TenantId == tenantId).Include(t => t.WorkItem).Include(t=>t.Employee).ToListAsync();
             var taskIdList = taskAllocations.Select(t => t.Id).ToList();
             List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).Include(t => t.Employee).ToListAsync();
 
             List<ListTaskVM> tasks = new List<ListTaskVM>();
-            foreach (var workItem in workItems)
-            {
+            //foreach (var workItem in workItems)
+            //{
                 foreach (var taskAllocation in taskAllocations)
                 {
                     
@@ -207,7 +208,7 @@ namespace MarcoBMS.Services.Controllers
                     tasks.Add(response);
                 }
                 
-            }
+            //}
             return Ok(ApiResponse<object>.SuccessResponse(tasks, "Success", 200));
         }
 
@@ -233,7 +234,12 @@ namespace MarcoBMS.Services.Controllers
                     var result = member.Employee.ToEmployeeVMFromEmployee();
                     teamMembers.Add(result);
                 }
-                taskVM.Comments = comments;
+                List<CommentVM> Comments = new List<CommentVM> { };
+                foreach (var comment in comments)
+                {
+                    Comments.Add(comment.ToCommentVMFromTaskComment());
+                }
+                taskVM.Comments = Comments;
                 taskVM.TeamMembers = teamMembers;
                 return Ok(ApiResponse<object>.SuccessResponse(taskVM, "Success", 200));
             }