diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html
index e319bfb1a..f74dd49c6 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.html
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html
@@ -60,12 +60,17 @@
       <!-- <ion-segment-button value="MDGPR">
         Minha agenda
       </ion-segment-button> -->
-
-      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryReverse; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId || calendars.OwnerUserId">
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
-        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}}</div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
+      </ion-segment-button>
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryNoPr; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
+        <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index f389e9991..f423d7a8d 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -212,9 +212,7 @@ export class EventListPage implements OnInit {
     }, 1000);
   }
 
-  close() {
-    this.modalController.dismiss(null);
-  }
+
   goBack() {
     this.RouteService.goBack()
   }
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index c7c9b569e..f49a58816 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -51,7 +51,9 @@ export class EventsService {
   calendarNames = {}
   
   calendarNamesAry = []
+  calendarNamesAryNoPr = []
   calendarNamesAryReverse = []
+  calendarNamesAryPR = []
 
   calendarNamesType = {}
   calendarRole = []
@@ -64,9 +66,7 @@ export class EventsService {
     private http: HttpClient,
     public user: AuthService,
     private changeProfileService: ChangeProfileService,
-    private offlinemanager: OfflineManagerService,
-    private storage: Storage,
-    private backgroundservice: BackgroundService) {
+    private offlinemanager: OfflineManagerService) {
 
     this.setHeader()
     this.changeProfileService.registerCallback(() => {
@@ -213,8 +213,8 @@ export class EventsService {
           this.hasOwnPessoal = true
 
           this.headerOwnPessoal = this.headerOwnPessoal.set('Authorization', SessionStore.user.BasicAuthKey);
-          this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarId', calendar.CalendarId);
-          this.headerOwnPessoal =this.headerOwnPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
+          this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarId', calendar.CalendarId);
+          this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarRoleId', calendar.CalendarRoleId);
           this.headerOwnPessoal = this.headerOwnPessoal.set('CalendarName', calendar.CalendarName);
         }
       }
@@ -271,6 +271,12 @@ export class EventsService {
               }
               
               this.calendarNamesAry.push(objectShared)
+
+              if(e.Role == 'Presidente da República') {
+                this.calendarNamesAryPR.push(objectShared)
+              } else {
+                this.calendarNamesAryNoPr.push(objectShared)
+              }
               
               this.calendarNamesType[e.FullName] = {}
             }
@@ -291,6 +297,7 @@ export class EventsService {
 
         if(!this.calendarNamesAry.includes('Meu calendario')) {
           this.calendarNamesAry.push('Meu calendario')
+          this.calendarNamesAryNoPr.push('Meu calendario')
           this.calendarNamesType['Meu calendario'] = {}
         }
 
diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/shared/agenda/event-list/event-list.page.html
index a773cacc8..f96643093 100644
--- a/src/app/shared/agenda/event-list/event-list.page.html
+++ b/src/app/shared/agenda/event-list/event-list.page.html
@@ -10,7 +10,13 @@
     </div>
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
-      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryReverse; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
+        <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
+        <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
+      </ion-segment-button>
+      <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryNoPr; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
         <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
         <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
index a95b3f439..0a6442cd9 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html
@@ -91,11 +91,17 @@
           Minha agenda
         </ion-segment-button> -->
 
-        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAry; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId" (ionChange)="dynamicSearch()">
+        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryPR; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
           <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
-          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'">{{ environment.agendaPR }}</div>
-          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> environment.agendaVP </div>
-          <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname }} </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
+        </ion-segment-button>
+        <ion-segment-button *ngFor="let calendars of eventService.calendarNamesAryNoPr; let i  index"  [value]="i === 'Meu calendario' ? 'Meu calendario' : i.OwnerUserId ">
+          <div *ngIf="calendars == 'Meu calendario'"> Minha agenda </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Presidente da República'"> {{ environment.agendaPR}} </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role == 'Ministro e Director do Gabinete do PR'"> {{ environment.agendaVP}} </div>
+          <div *ngIf="calendars != 'Meu calendario' && calendars.Role != 'Ministro e Director do Gabinete do PR' && calendars.Role != 'Presidente da República'"> Agenda do {{calendars.Fullname}} </div>
         </ion-segment-button>
       </ion-segment>
     </ion-toolbar>
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index b3daa426c..889e47f20 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -151,6 +151,7 @@ export class EventsToApprovePage implements OnInit {
 
   segmentChanged(ev: any) {
     this.LoadToApproveEvents();
+    this.dynamicSearch()
   }
 
   async LoadToApproveEvents() {
diff --git a/version/git-version.ts b/version/git-version.ts
index ff2d87cf5..61773c9e6 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "0cab890ef",
-  "SHA": "0cab890efd6f499e81a7080401b98d5b49baa4ed",
+  "shortSHA": "1e568d096",
+  "SHA": "1e568d096a95af07afb280bc94c6d39af8801645",
   "branch": "feature/gabinete-search",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jun 12 12:30:58 2023 +0100'",
-  "lastCommitMessage": "change color",
-  "lastCommitNumber": "5008",
+  "lastCommitTime": "'Tue Jun 13 10:53:59 2023 +0100'",
+  "lastCommitMessage": "fix route",
+  "lastCommitNumber": "5009",
   "change": "",
-  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/app.module.ts\n\tmodified:   src/app/pages/gabinete-digital/diplomas/diplomas.page.ts\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified:   src/app/pages/gabinete-digital/gabinete-digital.page.ts",
+  "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified:   src/app/services/events.service.ts\n\tmodified:   src/app/shared/agenda/event-list/event-list.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html\n\tmodified:   src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file