diff --git a/src/Controller/Admin/DashboardController.php b/src/Controller/Admin/DashboardController.php
index 84a25d4..ad23c2a 100644
--- a/src/Controller/Admin/DashboardController.php
+++ b/src/Controller/Admin/DashboardController.php
@@ -17,20 +17,20 @@ class DashboardController extends AbstractController
     #[Route('/dashboard', name: 'dashboard')]
     public function dashboard(ManagerRegistry $doctrine): Response
     {
-        $users = $doctrine->getRepository(User::class)->findAll();
-        $calendars = $doctrine->getRepository(CalendarInstance::class)->findAll();
-        $addressbooks = $doctrine->getRepository(AddressBook::class)->findAll();
-        $events = $doctrine->getRepository(CalendarObject::class)->findAll();
-        $contacts = $doctrine->getRepository(Card::class)->findAll();
+        $usersCount = $doctrine->getRepository(User::class)->count([]);
+        $calendarsCount = $doctrine->getRepository(CalendarInstance::class)->count([]);
+        $addressbooksCount = $doctrine->getRepository(AddressBook::class)->count([]);
+        $eventsCount = $doctrine->getRepository(CalendarObject::class)->count([]);
+        $contactsCount = $doctrine->getRepository(Card::class)->count([]);
 
         $timezoneParameter = $this->getParameter('timezone');
 
         return $this->render('dashboard.html.twig', [
-            'users' => $users,
-            'calendars' => $calendars,
-            'addressbooks' => $addressbooks,
-            'events' => $events,
-            'contacts' => $contacts,
+            'users' => $usersCount,
+            'calendars' => $calendarsCount,
+            'addressbooks' => $addressbooksCount,
+            'events' => $eventsCount,
+            'contacts' => $contactsCount,
             'timezone' => [
                 'actual_default' => date_default_timezone_get(),
                 'not_set_in_app' => '' === $timezoneParameter,
diff --git a/src/Controller/DAVController.php b/src/Controller/DAVController.php
index abb1e5d..5c070fe 100644
--- a/src/Controller/DAVController.php
+++ b/src/Controller/DAVController.php
@@ -312,6 +312,19 @@ private function initExceptionListener()
         });
     }
 
+    #[Route('/dav.php/{path?}', name: 'dav-old', requirements: ['path' => '.*'])]
+    public function davLegacy(Request $request, ?string $path): Response
+    {
+        return $this->redirect($this->generateUrl('dav', ['path' => $path ?? '']).$this->buildQueryString($request), 301);
+    }
+
+    private function buildQueryString(Request $request): string
+    {
+        $qs = $request->getQueryString();
+
+        return $qs ? '?'.$qs : '';
+    }
+
     #[Route('/dav/{path}', name: 'dav', requirements: ['path' => '.*'])]
     public function dav(Request $request, ?string $path, ?Profiler $profiler = null)
     {
diff --git a/templates/dashboard.html.twig b/templates/dashboard.html.twig
index 3ec0e13..d8b9e3e 100644
--- a/templates/dashboard.html.twig
+++ b/templates/dashboard.html.twig
@@ -57,19 +57,19 @@
 
     <ul class="list-group mb-5">
       <li class="list-group-item d-flex justify-content-between align-items-center">
-        {{ "dashboard.users"|trans }} <span class="badge bg-primary rounded-pill">{{ users|length }}</span>
+        {{ "dashboard.users"|trans }} <span class="badge bg-primary rounded-pill">{{ users }}</span>
       </li>
       <li class="list-group-item d-flex justify-content-between align-items-center">
-        <div>{{ "dashboard.calendars"|trans }}&nbsp;<span class="small text-muted ms-1 me-auto">{{ "dashboard.calendars.help"|trans }}</span></div> <span class="badge bg-primary rounded-pill">{{ calendars|length }}</span>
+        <div>{{ "dashboard.calendars"|trans }}&nbsp;<span class="small text-muted ms-1 me-auto">{{ "dashboard.calendars.help"|trans }}</span></div> <span class="badge bg-primary rounded-pill">{{ calendars }}</span>
       </li>
       <li class="list-group-item d-flex justify-content-between align-items-center">
-        ↳ {{ "dashboard.events"|trans }} <span class="badge bg-secondary rounded-pill">{{ events|length }}</span>
+        ↳ {{ "dashboard.events"|trans }} <span class="badge bg-secondary rounded-pill">{{ events }}</span>
       </li>
       <li class="list-group-item d-flex justify-content-between align-items-center">
-        {{ "dashboard.address_books"|trans }} <span class="badge bg-primary rounded-pill">{{ addressbooks|length }}</span>
+        {{ "dashboard.address_books"|trans }} <span class="badge bg-primary rounded-pill">{{ addressbooks }}</span>
       </li>
       <li class="list-group-item d-flex justify-content-between align-items-center">
-        ↳ {{ "dashboard.contacts"|trans }} <span class="badge bg-secondary rounded-pill">{{ contacts|length }}</span>
+        ↳ {{ "dashboard.contacts"|trans }} <span class="badge bg-secondary rounded-pill">{{ contacts }}</span>
       </li>
     </ul>
   </div>