diff --git a/.version b/.version
index 8cb1c72..961423f 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-0.5.8.9
\ No newline at end of file
+0.5.9.10
\ No newline at end of file
diff --git a/Brizco.Api/Brizco.Api.csproj b/Brizco.Api/Brizco.Api.csproj
index c45e900..74a8b5a 100644
--- a/Brizco.Api/Brizco.Api.csproj
+++ b/Brizco.Api/Brizco.Api.csproj
@@ -6,8 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
-    <AssemblyVersion>0.5.8.9</AssemblyVersion>
-    <FileVersion>0.5.8.9</FileVersion>
+    <AssemblyVersion>0.5.9.10</AssemblyVersion>
+    <FileVersion>0.5.9.10</FileVersion>
   </PropertyGroup>
 
 	<ItemGroup>
diff --git a/Brizco.Api/Controllers/ActivityController.cs b/Brizco.Api/Controllers/ActivityController.cs
index 5b340cb..f577c6d 100644
--- a/Brizco.Api/Controllers/ActivityController.cs
+++ b/Brizco.Api/Controllers/ActivityController.cs
@@ -52,7 +52,7 @@ public class ActivityController : ICarterModule
 
     // GET:Get All Entity
     public async Task<IResult> GetAllAsync([FromQuery] int page, [FromQuery] DateQueryFilter? dateQueryFilter, [FromQuery] long? selectedDate, [FromQuery] Guid? selectedShift, ISender sender, CancellationToken cancellationToken)
-        => TypedResults.Ok(await sender.Send(new GetActivitiesQuery(Page: page, SelectedDate: selectedDate ?? 0 , SelectedShift: selectedShift ?? default), cancellationToken));
+        => TypedResults.Ok(await sender.Send(new GetActivitiesQuery(Page: page, SelectedDate: selectedDate ?? 0 , SelectedShift: selectedShift ?? default , DateQueryFilter: dateQueryFilter ?? null), cancellationToken));
 
     // GET:Get An Entity By Id
     public async Task<IResult> GetAsync(Guid id, IActivityService activityService, CancellationToken cancellationToken)
diff --git a/Brizco.Core/CoreServices/PageService.cs b/Brizco.Core/CoreServices/PageService.cs
index 4aead5a..c99c464 100644
--- a/Brizco.Core/CoreServices/PageService.cs
+++ b/Brizco.Core/CoreServices/PageService.cs
@@ -32,11 +32,11 @@ public class PageService : IPageService
 
         var todayTasks = await _repositoryWrapper.SetRepository<Activity>()
             .TableNoTracking
-            .Where(a => a.UserId == userId)
+            .Where(a => a.ComplexId == complexId && a.SetFor.Date == DateTime.Today.Date)
             .ToListAsync(cancellationToken);
         var todayShiftPlans = await _repositoryWrapper.SetRepository<ShiftPlan>()
             .TableNoTracking
-            .Where(a => a.PlanFor.Date == DateTime.Today.Date)
+            .Where(a => a.PlanFor.Date == DateTime.Today.Date && a.ComplexId == complexId)
             .Select(ShiftPlanMapper.ProjectToSDto)
             .ToListAsync(cancellationToken);
         var names = new List<string>();
diff --git a/Brizco.Repository/Handlers/Activity/GetActivitiesQueryHandler.cs b/Brizco.Repository/Handlers/Activity/GetActivitiesQueryHandler.cs
index 4bd2f88..d1a6d43 100644
--- a/Brizco.Repository/Handlers/Activity/GetActivitiesQueryHandler.cs
+++ b/Brizco.Repository/Handlers/Activity/GetActivitiesQueryHandler.cs
@@ -25,9 +25,9 @@ public class GetActivitiesQueryHandler : IRequestHandler<GetActivitiesQuery, Lis
 
         IQueryable<Domain.Entities.Task.Activity> activities = _repositoryWrapper.SetRepository<Domain.Entities.Task.Activity>().TableNoTracking
             .Where(a=>a.IsActivity);
-        if (_currentUserService.Permissions != null)
+        if (_currentUserService is { Permissions: not null, RoleName: not null })
         {
-            if (_currentUserService.Permissions.Contains(ApplicationPermission.ViewMineActivities))
+            if (_currentUserService.Permissions.Contains(ApplicationPermission.ViewMineActivities) && _currentUserService.RoleName == ApplicationRoles.Staff)
                 activities = activities.Where(a => a.UserId == userId);
         }
 
@@ -60,9 +60,10 @@ public class GetActivitiesQueryHandler : IRequestHandler<GetActivitiesQuery, Lis
 
 
 
-        return await activities.OrderBy(s => s.ScheduleType)
+        var response= await activities.OrderByDescending(s => s.UserId)
             .Skip(request.Page * 20).Take(20)
             .Select(ActivityMapper.ProjectToSDto)
             .ToListAsync(cancellationToken);
+        return response;
     }
 }
\ No newline at end of file