diff --git a/package-lock.json b/package-lock.json
index abf0080d..b346ab1f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2368,22 +2368,22 @@
       "dev": true
     },
     "@clr/angular": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@clr/angular/-/angular-1.0.4.tgz",
-      "integrity": "sha512-ikvfsgJACuqerRzU92LFx1eD63v24BhKJETpqQaLZvqZvDAdilIBq5fVOmhfzqyiFjO38zlweYhBJ7k99IAGjg==",
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@clr/angular/-/angular-2.3.5.tgz",
+      "integrity": "sha512-UESi0zZ8lEtuG8GJJ9K4anjBRi/MdTNz3t2hWWLRQvZjpxFY3N6gMh9cwA2pWA8r6/X7MUfUVnKTlOtddgMvew==",
       "requires": {
         "tslib": "^1.9.0"
       }
     },
     "@clr/icons": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@clr/icons/-/icons-1.0.4.tgz",
-      "integrity": "sha512-H+U+ScjCRbmE00hkCF/8Q43e/QHUrK+0ubMMAa82zwN8cmg4L8PsPEJsRSctlCeokeQ+kxADS0ZGqRIjoB/+cw=="
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@clr/icons/-/icons-2.3.5.tgz",
+      "integrity": "sha512-TyNDUY+Bhdbo5c18nwKqy4BC6ipt5S0mn3ot/byroUW/uliEOtw/nGj1q7pb+1r3EIsO8Mh4ndbaoUtc45XMRQ=="
     },
     "@clr/ui": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@clr/ui/-/ui-1.0.4.tgz",
-      "integrity": "sha512-OAB4K7CQ/NXsiJB8q5Jj4xyHKIHDYjgy/8C6mjdgx4dTsiLb649ma7wBOh6uy83gCnEJmFJ6Og3jL3NyEkFpFA=="
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@clr/ui/-/ui-2.3.5.tgz",
+      "integrity": "sha512-vQdirjzIwlYjjhzNgDKdHWn7+x+sJ63YySLQYSHpVzM36VzMX/KYp+gfnTjO4LwhOZVn6lNPP5rnmzcY6sxs6w=="
     },
     "@ngtools/webpack": {
       "version": "8.3.22",
diff --git a/package.json b/package.json
index 366fb370..cd4692f1 100644
--- a/package.json
+++ b/package.json
@@ -30,9 +30,9 @@
         "@bugsnag/js": "^6.5.0",
         "@bugsnag/plugin-angular": "^6.5.0",
         "@bugsnag/plugin-express": "^6.5.1",
-        "@clr/angular": "^1.0.4",
-        "@clr/icons": "^1.0.4",
-        "@clr/ui": "^1.0.4",
+        "@clr/angular": "^2.3.5",
+        "@clr/icons": "^2.3.5",
+        "@clr/ui": "^2.3.5",
         "@webcomponents/custom-elements": "^1.1.2",
         "angular-highcharts": "^8.0.3",
         "body-parser": "^1.19.0",
diff --git a/src/app/services/factions.service.ts b/src/app/services/factions.service.ts
index b410f108..0c045c0c 100644
--- a/src/app/services/factions.service.ts
+++ b/src/app/services/factions.service.ts
@@ -11,7 +11,7 @@ export class FactionsService {
 
     getFactionsBegins(page: string, name: string): Observable<EBGSFactionsWOHistory> {
         return this.http.get<EBGSFactionsWOHistory>('/frontend/factions', {
-            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page).set('beginsWith', name)
+            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page + 1).set('beginsWith', name)
         });
     }
 
@@ -41,7 +41,7 @@ export class FactionsService {
 
     getHistoryAdmin(page: string, id: string): Observable<EBGSFactionHistoryPaginate> {
         return this.http.get<EBGSFactionHistoryPaginate>('/frontend/factionhistoryadmin', {
-            params: new HttpParams().set('id', id).set('page', page)
+            params: new HttpParams().set('id', id).set('page', page + 1)
         });
     }
 
diff --git a/src/app/services/stations.service.ts b/src/app/services/stations.service.ts
index ae0c7ace..72a55b1b 100644
--- a/src/app/services/stations.service.ts
+++ b/src/app/services/stations.service.ts
@@ -11,7 +11,7 @@ export class StationsService {
 
     getStationsBegins(page: string, name: string): Observable<EBGSStationsWOHistory> {
         return this.http.get<EBGSStationsWOHistory>('/frontend/stations', {
-            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page).set('beginsWith', name)
+            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page + 1).set('beginsWith', name)
         });
     }
 
@@ -41,7 +41,7 @@ export class StationsService {
 
     getHistoryAdmin(page: string, id: string): Observable<EBGSStationHistory> {
         return this.http.get<EBGSStationHistory>('/frontend/stationhistoryadmin', {
-            params: new HttpParams().set('id', id).set('page', page)
+            params: new HttpParams().set('id', id).set('page', page + 1)
         });
     }
 
diff --git a/src/app/services/systems.service.ts b/src/app/services/systems.service.ts
index 2a653d97..d8cb80df 100644
--- a/src/app/services/systems.service.ts
+++ b/src/app/services/systems.service.ts
@@ -11,7 +11,7 @@ export class SystemsService {
 
     getSystemsBegins(page: string, name: string): Observable<EBGSSystemsWOHistory> {
         return this.http.get<EBGSSystemsWOHistory>('/frontend/systems', {
-            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page).set('beginsWith', name)
+            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page + 1).set('beginsWith', name)
         });
     }
 
@@ -41,7 +41,7 @@ export class SystemsService {
 
     getHistoryAdmin(page: string, id: string): Observable<EBGSSystemHistory> {
         return this.http.get<EBGSSystemHistory>('/frontend/systemhistoryadmin', {
-            params: new HttpParams().set('id', id).set('page', page)
+            params: new HttpParams().set('id', id).set('page', page + 1)
         });
     }
 
diff --git a/src/app/services/users.service.ts b/src/app/services/users.service.ts
index bad7eea0..96c57e70 100644
--- a/src/app/services/users.service.ts
+++ b/src/app/services/users.service.ts
@@ -36,7 +36,7 @@ export class UsersService {
 
     getUsersBegins(page: string, user: string): Observable<EBGSUsers> {
         return this.http.get<EBGSUsers>('/frontend/users', {
-            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page).set('beginsWith', user)
+            params: new HttpParams({ encoder: new CustomEncoder() }).set('page', page + 1).set('beginsWith', user)
         }).pipe(map((users: EBGSUsers): EBGSUsers => {
             users.docs.forEach((singleUser, i, allUsers) => {
                 allUsers[i].patronage.since = new Date(singleUser.patronage.since);