diff --git a/openapi.yaml b/openapi.yaml
index 04b24dbd2..78be14d41 100644
--- a/openapi.yaml
+++ b/openapi.yaml
@@ -1176,25 +1176,9 @@ components:
       type: object
       properties:
         text:
-          type: object
-          properties:
-            de:
-              type: string
-            en:
-              type: string
-          required:
-            - de
-            - en
+          type: string
         url:
-          type: object
-          properties:
-            de:
-              type: string
-            en:
-              type: string
-          required:
-            - de
-            - en
+          type: string
       required:
         - text
         - url
@@ -1649,17 +1633,19 @@ components:
                     example: 126
                     minimum: 0
                   children:
-                    type: object
-                    properties:
-                      id:
-                        description: The id of the building
-                        type: string
-                      name:
-                        description: Main display name
-                        type: string
-                    required:
-                      - id
-                      - name
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        id:
+                          description: The id of the room
+                          type: string
+                        name:
+                          description: Main display name
+                          type: string
+                      required:
+                        - id
+                        - name
                 required:
                   - children
                   - count
@@ -1727,6 +1713,25 @@ components:
             $ref: '#/components/schemas/ImageInfo'
         ranking_factors:
           $ref: '#/components/schemas/RankingFactors'
+        sources:
+          type: object
+          required:
+            - base
+          description: 'Where we got our data from, should be displayed at the bottom of any page containing this data'
+          properties:
+            base:
+              type: array
+              description: What is the basis of the data we have
+              items:
+                type: object
+                minProperties: 1
+                properties:
+                  name:
+                    type: string
+                    example: NavigaTUM
+                    description: The name of the provider
+                required:
+                  - name
       required:
         - type_common_name
         - name
@@ -1734,6 +1739,7 @@ components:
         - parent_names
         - props
         - ranking_factors
+        - sources
     CalendarResponse:
       type: object
       properties:
diff --git a/webclient/README.md b/webclient/README.md
index 3a66faf05..08020405a 100644
--- a/webclient/README.md
+++ b/webclient/README.md
@@ -63,7 +63,7 @@ npm run lint
 ### Update the API's type definitions
 
 ```sh
-npx openapi-typescript openapi.yaml --output webclient/src/codegen/api.ts --export-type --immutable-types 
+npx openapi-typescript openapi.yaml --output webclient/src/api_types/index.ts --export-type --immutable-types --support-array-length
 ```
 
 ## Build files & Serving release build
diff --git a/webclient/src/App.vue b/webclient/src/App.vue
index 194a1b103..7a39ad512 100644
--- a/webclient/src/App.vue
+++ b/webclient/src/App.vue
@@ -130,19 +130,20 @@ const global = useGlobalStore();
   </footer>
   <FeedbackModal v-if="global.feedback.open" />
   <!-- General message modal -->
-  <div class="modal" :class="active" v-if="global.information_modal?.body">
+  <div class="modal active" v-if="global.information_modal?.body">
     <div class="modal-overlay" @click="global.information_modal.body = null"></div>
     <div class="modal-container">
       <div class="modal-header">
         <button
           class="btn btn-clear float-right"
           aria-label="Close"
-          @click="global.information_modal.body = null"></button>
+          @click="global.information_modal.body = null"
+        ></button>
         <div v-if="global.information_modal.header" class="modal-title h5">{{ global.information_modal.header }}</div>
       </div>
       <div class="modal-body">
         <div class="content">
-          <p>{{ modal.body }}</p>
+          <p>{{ global.information_modal.body }}</p>
         </div>
       </div>
     </div>
diff --git a/webclient/src/api_types/index.ts b/webclient/src/api_types/index.ts
index 57a30707c..eb085b398 100644
--- a/webclient/src/api_types/index.ts
+++ b/webclient/src/api_types/index.ts
@@ -3,6 +3,15 @@
  * Do not make direct changes to the file.
  */
 
+/** Type helpers */
+type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
+type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
+type OneOf<T extends any[]> = T extends [infer Only]
+  ? Only
+  : T extends [infer A, infer B, ...infer Rest]
+  ? OneOf<[XOR<A, B>, ...Rest]>
+  : never;
+
 export type paths = {
   "/api/search": {
     /**
@@ -29,30 +38,23 @@ export type paths = {
      */
     get: operations["details"];
   };
-  "/api/preview/{id}": {
+  "/api/calendar/{id}": {
     /**
      * Get a entry-preview
      * @description This returns the a 1200x630px preview for the entry (room/building/..).
      *
      * This is usefull for implementing custom OpenGraph images for detail previews.
      */
-    get: operations["previews"];
-  };
-  "/api/source_code": {
-    /**
-     * Get link to running source-code
-     * @description This endpoint returns a link to the source-code of the repository at the currently running version.
-     * This endpoint is not required for modifications (as the license is not AGPL), but strongly encouraged.
-     */
-    get: operations["source_code"];
+    get: operations["calendar"];
   };
-  "/api/feedback/source_code": {
+  "/api/preview/{id}": {
     /**
-     * Get link to running source-code
-     * @description This endpoint returns a link to the source-code of the repository at the currently running version.
-     * This endpoint is not required for modifications (as the license is not AGPL), but strongly encouraged.
+     * Get a entry-preview
+     * @description This returns the a 1200x630px preview for the entry (room/building/..).
+     *
+     * This is usefull for implementing custom OpenGraph images for detail previews.
      */
-    get: operations["feedback-source_code"];
+    get: operations["previews"];
   };
   "/api/feedback/get_token": {
     /**
@@ -68,9 +70,8 @@ export type paths = {
      * Tokens gain validity after 5s, and are invalid after 12h of being issued.
      * They are not refreshable, and are only valid for one usage.
      *
-     * Global Rate-Limiting:
-     *  - hourly: 20 tokens per hour
-     *  - daily: 50 tokens per
+     * ***Important Note:***
+     * Global Rate-Limiting allows bursts with up to 20 requests and replenishes 50 requests per day
      */
     post: operations["get_token"];
   };
@@ -124,20 +125,27 @@ export type paths = {
      */
     get: operations["legacy_redirect"];
   };
-  "/api/health": {
+  "/api/status": {
     /**
      * API healthcheck
      * @description If this endpoint does not return 200, the API is experiencing a catastrophic outage. Should never happen.
      */
     get: operations["api-health"];
   };
-  "/api/feedback/health": {
+  "/api/feedback/status": {
     /**
      * feedback-API healthcheck
      * @description If this endpoint does not return 200, the API is experiencing a catastrophic outage. Should never happen.
      */
     get: operations["feedback-health"];
   };
+  "/api/calendar/status": {
+    /**
+     * calendar-API healthcheck
+     * @description If this endpoint does not return 200, the API is experiencing a catastrophic outage. Should never happen.
+     */
+    get: operations["calendar-health"];
+  };
   "/cdn/health": {
     /**
      * CDN healthcheck
@@ -160,6 +168,32 @@ export type components = {
   schemas: {
     /** @description Data for the info-card table */
     readonly Props: {
+      /** @description The operator of the room */
+      readonly operator?: {
+        /**
+         * @description The designation code of the operator
+         * @example TUS7000
+         */
+        readonly code?: string;
+        /**
+         * @description The full name of the operator (localized). Null for organisations that
+         * are no longer active (e.g. id=38698), but where the operator has not been
+         * updated in TUMonline.
+         *
+         * @example TUM School of Social Sciences and Technology
+         */
+        readonly name?: OneOf<[string, null]>;
+        /**
+         * @description A link to the operator
+         * @example https://campus.tum.de/tumonline/webnav.navigate_to?corg=51901
+         */
+        readonly url?: string;
+        /**
+         * @description The id of the operator
+         * @example 51901
+         */
+        readonly id?: number;
+      };
       readonly computed: readonly components["schemas"]["ComputedProp"][];
       readonly links?: readonly components["schemas"]["LinkProp"][];
       /**
@@ -168,12 +202,6 @@ export type components = {
        * An example of a room with a comment is MW1801.
        */
       readonly comment?: string;
-      /**
-       * @example [
-       *   "https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12543&cReadonly=J",
-       *   "https://campus.tum.de/tumonline/tvKalender.wSicht?cOrg=19691&cRes=12559&cReadonly=J"
-       * ]
-       */
       readonly calendar_url?: Record<string, never>;
     };
     readonly ComputedProp: {
@@ -181,17 +209,17 @@ export type components = {
       readonly name: string;
       /** @example 5602.EG.001 */
       readonly text: string;
+      readonly extra?: {
+        /** @example Genauere Angaben */
+        readonly header?: string;
+        /** @example für Prüfungen: 102 in eng, 71 in weit, 49 in corona */
+        readonly body?: string;
+      };
     };
     /** @description A link with a localized link text and url */
     readonly LinkProp: {
-      readonly text: {
-        readonly de: string;
-        readonly en: string;
-      };
-      readonly url: {
-        readonly de: string;
-        readonly en: string;
-      };
+      readonly text: string;
+      readonly url: string;
     };
     /** @description The information you need to request Images from the /cdn/{size}/{id}_{counter}.webp endpoint */
     readonly ImageInfo: {
@@ -239,7 +267,7 @@ export type components = {
       /** @description The text to display */
       readonly text: string;
       /** @description The URL to the referenced information. Always either null or a valid URL */
-      readonly url?: string | null;
+      readonly url?: OneOf<[string, null]>;
     };
     readonly Coordinate: {
       /**
@@ -259,36 +287,10 @@ export type components = {
        * @example roomfinder
        */
       readonly source: string;
-      readonly utm?: {
-        /**
-         * Format: double
-         * @description The easting
-         * @example 698288.4681410069
-         */
-        readonly easting?: number;
-        /**
-         * Format: double
-         * @description The northing
-         * @example 5349538.736274569
-         */
-        readonly northing?: number;
-        /**
-         * @description The zone
-         * @example U
-         */
-        readonly zone?: string;
-        /**
-         * Format: int32
-         * @description The zone number
-         * @example 32
-         */
-        readonly zone_number?: number;
-      };
     };
     readonly Maps: {
       /**
        * @description The type of the Map that should be shown by default
-       * @example interactive
        * @enum {string}
        */
       readonly default: "interactive" | "roomfinder";
@@ -297,18 +299,23 @@ export type components = {
        * @description null would mean no overlay maps are displayed by default.
        * For rooms you should add a warning that no floor map is available for this room
        */
-      readonly overlays?: {
-        /**
-         * @description The floor-id of the map, that should be shown as a default.
-         * null:
-         * - We suggest, you dont show a map by default.
-         * - This is only the case for buildings or other such entities and not for rooms, if we know where they are and a map exists
-         *
-         * @example 0
-         */
-        readonly default: number | null;
-        readonly available: readonly components["schemas"]["OverlayMapEntry"][];
-      } | null;
+      readonly overlays?: OneOf<
+        [
+          {
+            /**
+             * @description The floor-id of the map, that should be shown as a default.
+             * null:
+             * - We suggest, you dont show a map by default.
+             * - This is only the case for buildings or other such entities and not for rooms, if we know where they are and a map exists
+             *
+             * @example 0
+             */
+            readonly default: OneOf<[number, null]>;
+            readonly available: readonly components["schemas"]["OverlayMapEntry"][];
+          },
+          null
+        ]
+      >;
     };
     readonly RoomfinderMap: {
       /**
@@ -387,7 +394,12 @@ export type components = {
        */
       readonly file: string;
       /** @description Coordinates are four [lon, lat] pairs, for the top left, top right, bottom right, bottom left image corners. */
-      readonly coordinates: readonly (readonly number[])[];
+      readonly coordinates: readonly [
+        readonly [number, number],
+        readonly [number, number],
+        readonly [number, number],
+        readonly [number, number]
+      ];
     };
     readonly Rooms: {
       /**
@@ -502,12 +514,12 @@ export type components = {
            * @example 126
            */
           readonly count: number;
-          readonly children: {
-            /** @description The id of the building */
+          readonly children: readonly {
+            /** @description The id of the room */
             readonly id: string;
             /** @description Main display name */
             readonly name: string;
-          };
+          }[];
         }[];
       };
     };
@@ -541,17 +553,61 @@ export type components = {
        * @example 5602.EG.001 (MI HS 1, Friedrich L. Bauer Hörsaal)
        */
       readonly arch_name?: string;
-      /**
-       * @example [
-       *   "root",
-       *   "garching"
-       * ]
-       */
       readonly parents: readonly string[];
-      readonly parent_names: readonly string[];
+      readonly parent_names: readonly [string, ...string[]];
       readonly props: components["schemas"]["Props"];
       readonly imgs?: readonly components["schemas"]["ImageInfo"][];
       readonly ranking_factors: components["schemas"]["RankingFactors"];
+      /** @description Where we got our data from, should be displayed at the bottom of any page containing this data */
+      readonly sources: {
+        /** @description What is the basis of the data we have */
+        readonly base: readonly {
+          /**
+           * @description The name of the provider
+           * @example NavigaTUM
+           */
+          readonly name: string;
+        }[];
+      };
+    };
+    readonly CalendarResponse: {
+      /** @description The entries of the requested */
+      readonly entries: readonly components["schemas"]["CalendarEntry"][];
+      /**
+       * Format: date-time
+       * @description When the last sync with TUMonline happened.
+       * @example 2018-01-01T00:00:00
+       */
+      readonly last_sync: string;
+    };
+    readonly CalendarEntry: {
+      /**
+       * @description The title of the Entry
+       * @example Quantenteleportation
+       */
+      readonly title: string;
+      /**
+       * Format: date-time
+       * @description The start of the entry
+       * @example 2018-01-01T00:00:00
+       */
+      readonly start: string;
+      /**
+       * Format: date-time
+       * @description The end of the entry
+       * @example 2018-01-01T00:00:00
+       */
+      readonly end: string;
+      /**
+       * @description What this calendar entry means. Each of these should be displayed in a different color
+       * @enum {string}
+       */
+      readonly entry_type: "lecture" | "exercise" | "exam" | "barred" | "other";
+      /**
+       * @description For some Entrys, we do have more information (what kind of a `lecture` is it? What kind of an other `entry` is it?)
+       * @example Vorlesung mit Zentralübung
+       */
+      readonly detailed_entry_type: string;
     };
     readonly RankingFactors: {
       /**
@@ -688,11 +744,7 @@ export type operations = {
         };
       };
       /** @description Invalid Request */
-      400: {
-        content: {
-          readonly "text/plain": "Invalid Request";
-        };
-      };
+      400: never;
       /** @description `search_query` is empty. Since searching for nothing is nonsensical, we dont support this. */
       404: {
         content: {
@@ -700,11 +752,7 @@ export type operations = {
         };
       };
       /** @description The uri you are trying to request is unreasonably long. Search querys dont have thousands of chars.. */
-      414: {
-        content: {
-          readonly "text/plain": "Uri too long";
-        };
-      };
+      414: never;
     };
   };
   details: {
@@ -742,7 +790,7 @@ export type operations = {
       };
     };
   };
-  previews: {
+  calendar: {
     /**
      * Get a entry-preview
      * @description This returns the a 1200x630px preview for the entry (room/building/..).
@@ -750,9 +798,11 @@ export type operations = {
      * This is usefull for implementing custom OpenGraph images for detail previews.
      */
     parameters: {
-      /** @description The language you want your preview to be in. If either this or the query parameter is set to en, this will be delivered. */
-      readonly query?: {
-        lang?: "de" | "en";
+      /** @description The first allowed time the calendar would like to display */
+      /** @description The last allowed time the calendar would like to display */
+      readonly query: {
+        start: string;
+        end: string;
       };
       /** @description string you want to search for */
       readonly path: {
@@ -760,10 +810,10 @@ export type operations = {
       };
     };
     responses: {
-      /** @description More data about the requested building/room */
+      /** @description More entries of the calendar in the requested time span */
       200: {
         content: {
-          readonly "image/png": unknown;
+          readonly "application/json": components["schemas"]["CalendarResponse"];
         };
       };
       /** @description Invalid input */
@@ -772,34 +822,42 @@ export type operations = {
           readonly "text/plain": "Not found";
         };
       };
-    };
-  };
-  source_code: {
-    /**
-     * Get link to running source-code
-     * @description This endpoint returns a link to the source-code of the repository at the currently running version.
-     * This endpoint is not required for modifications (as the license is not AGPL), but strongly encouraged.
-     */
-    responses: {
-      /** @description The link to the source-code of the repository at the currently running version */
-      200: {
+      /** @description Not Ready, please retry later */
+      503: {
         content: {
-          readonly "text/plain": string;
+          readonly "text/plain": "Waiting for first sync with TUMonline";
         };
       };
     };
   };
-  "feedback-source_code": {
+  previews: {
     /**
-     * Get link to running source-code
-     * @description This endpoint returns a link to the source-code of the repository at the currently running version.
-     * This endpoint is not required for modifications (as the license is not AGPL), but strongly encouraged.
+     * Get a entry-preview
+     * @description This returns the a 1200x630px preview for the entry (room/building/..).
+     *
+     * This is usefull for implementing custom OpenGraph images for detail previews.
      */
+    parameters: {
+      /** @description The language you want your preview to be in. If either this or the query parameter is set to en, this will be delivered. */
+      readonly query?: {
+        lang?: "de" | "en";
+      };
+      /** @description string you want to search for */
+      readonly path: {
+        id: string;
+      };
+    };
     responses: {
-      /** @description The link to the source-code of the repository at the currently running version */
+      /** @description More data about the requested building/room */
       200: {
         content: {
-          readonly "text/plain": string;
+          readonly "image/png": unknown;
+        };
+      };
+      /** @description Invalid input */
+      404: {
+        content: {
+          readonly "text/plain": "Not found";
         };
       };
     };
@@ -818,9 +876,8 @@ export type operations = {
      * Tokens gain validity after 5s, and are invalid after 12h of being issued.
      * They are not refreshable, and are only valid for one usage.
      *
-     * Global Rate-Limiting:
-     *  - hourly: 20 tokens per hour
-     *  - daily: 50 tokens per
+     * ***Important Note:***
+     * Global Rate-Limiting allows bursts with up to 20 requests and replenishes 50 requests per day
      */
     responses: {
       /** @description Returns a usable token */
@@ -833,22 +890,14 @@ export type operations = {
        * @description Too many requests.
        * We are rate-limiting everyone's requests, please try again later.
        */
-      429: {
-        content: {
-          readonly "text/plain": "Too many requests";
-        };
-      };
+      429: never;
       /**
        * @description Service unavailable.
        * We have not configured a GitHub Access Token or a JWT Key.
        * This could be because we are experiencing technical difficulties or intentional if we experience abuse of these endpoints.
        * Please try again later.
        */
-      503: {
-        content: {
-          readonly "text/plain": "Service unavailable";
-        };
-      };
+      503: never;
     };
   };
   feedback: {
@@ -877,11 +926,7 @@ export type operations = {
         };
       };
       /** @description If not all fields in the body are present as defined above */
-      400: {
-        content: {
-          readonly "text/plain": "Not all fields in the body are present as defined in the documentation";
-        };
-      };
+      400: never;
       /**
        * @description Forbidden. Causes are (delivered via the body):
        *
@@ -903,40 +948,24 @@ export type operations = {
        * @description Unprocessable Entity
        * Subject or body missing or too short.
        */
-      422: {
-        content: {
-          readonly "text/plain": "Unprocessable Entity";
-        };
-      };
+      422: never;
       /**
        * @description Unavailable for legal reasons.
        * Using this endpoint without accepting the privacy policy is not allowed.
        * For us to post to GitHub, this has to be true
        */
-      451: {
-        content: {
-          readonly "text/plain": "Unavailable for legal reasons";
-        };
-      };
+      451: never;
       /**
        * @description Internal Server Error.
        * We have a problem communicating with GitHubs servers. Please try again later.
        */
-      500: {
-        content: {
-          readonly "text/plain": "Internal Server Error";
-        };
-      };
+      500: never;
       /**
        * @description Service unavailable.
        * We have not configured a GitHub Access Token.
        * This could be because we are experiencing technical difficulties or intentional. Please try again later.
        */
-      503: {
-        content: {
-          readonly "text/plain": "Service unavailable";
-        };
-      };
+      503: never;
     };
   };
   img_cdn: {
@@ -972,7 +1001,7 @@ export type operations = {
       /** @description The image you requested */
       200: {
         content: {
-          readonly "image/webp": string;
+          readonly "image/webp": unknown;
         };
       };
       /**
@@ -980,11 +1009,7 @@ export type operations = {
        * The request was malformed.
        * Please check your request and try again.
        */
-      400: {
-        content: {
-          readonly "text/plain": "Bad Request";
-        };
-      };
+      400: never;
       /** @description Requested Resource Not Found */
       404: {
         content: {
@@ -992,11 +1017,7 @@ export type operations = {
         };
       };
       /** @description The uri you are trying to request is unreasonably long. neither ids, nor any other parameter has more than 30 chars.. */
-      414: {
-        content: {
-          readonly "text/plain": "Uri too long";
-        };
-      };
+      414: never;
     };
   };
   maps_cdn: {
@@ -1017,7 +1038,7 @@ export type operations = {
       /** @description The map you requested */
       200: {
         content: {
-          readonly "image/webp": string;
+          readonly "image/webp": unknown;
         };
       };
       /**
@@ -1025,11 +1046,7 @@ export type operations = {
        * The request was malformed.
        * Please check your request and try again.
        */
-      400: {
-        content: {
-          readonly "text/plain": "Bad Request";
-        };
-      };
+      400: never;
       /** @description Requested Resource Not Found */
       404: {
         content: {
@@ -1037,11 +1054,7 @@ export type operations = {
         };
       };
       /** @description The uri you are trying to request is unreasonably long. neither ids, nor any other parameter has more than 30 chars.. */
-      414: {
-        content: {
-          readonly "text/plain": "Uri too long";
-        };
-      };
+      414: never;
     };
   };
   legacy_redirect: {
@@ -1078,11 +1091,7 @@ export type operations = {
         };
       };
       /** @description Permanent redirect to the roomfinder */
-      301: {
-        content: {
-          readonly "text/plain": "Permanent Redirect";
-        };
-      };
+      301: never;
       /** @description Requested Resource Not Found */
       404: {
         content: {
@@ -1100,15 +1109,11 @@ export type operations = {
       /** @description Ok */
       200: {
         content: {
-          readonly "text/plain": "healthy";
+          readonly "text/plain": string;
         };
       };
       /** @description Service Unavailable */
-      503: {
-        content: {
-          readonly "text/plain": "Service Unavailable";
-        };
-      };
+      503: never;
     };
   };
   "feedback-health": {
@@ -1120,15 +1125,27 @@ export type operations = {
       /** @description Ok */
       200: {
         content: {
-          readonly "text/plain": "healthy";
+          readonly "text/plain": string;
         };
       };
       /** @description Service Unavailable */
-      503: {
+      503: never;
+    };
+  };
+  "calendar-health": {
+    /**
+     * calendar-API healthcheck
+     * @description If this endpoint does not return 200, the API is experiencing a catastrophic outage. Should never happen.
+     */
+    responses: {
+      /** @description Ok */
+      200: {
         content: {
-          readonly "text/plain": "Service Unavailable";
+          readonly "text/plain": string;
         };
       };
+      /** @description Service Unavailable */
+      503: never;
     };
   };
   "cdn-health": {
@@ -1144,11 +1161,7 @@ export type operations = {
         };
       };
       /** @description Service Unavailable */
-      503: {
-        content: {
-          readonly "text/plain": "Service Unavailable";
-        };
-      };
+      503: never;
     };
   };
   "web-health": {
@@ -1164,11 +1177,7 @@ export type operations = {
         };
       };
       /** @description Service Unavailable */
-      503: {
-        content: {
-          readonly "text/plain": "Service Unavailable";
-        };
-      };
+      503: never;
     };
   };
 };
diff --git a/webclient/src/components/AppSearchBar.vue b/webclient/src/components/AppSearchBar.vue
index ff9f5138e..0d91d876b 100644
--- a/webclient/src/components/AppSearchBar.vue
+++ b/webclient/src/components/AppSearchBar.vue
@@ -3,9 +3,10 @@ import { extractFacets } from "@/modules/autocomplete";
 import router from "@/router";
 import { useGlobalStore } from "@/stores/global";
 import { useI18n } from "vue-i18n";
+import { useFetch } from "@/utils/fetch";
+import type { SectionFacet } from "@/modules/autocomplete";
 import type { components } from "@/api_types";
 type SearchResponse = components["schemas"]["SearchResponse"];
-import { useFetch } from "@/utils/fetch";
 
 export default {
   mounted() {
@@ -26,8 +27,8 @@ export default {
       keep_focus: false,
       query: "",
       autocomplete: {
-        sections: [],
-        highlighted: null,
+        sections: [] as SectionFacet[],
+        highlighted: null as string | null,
       },
       // As a simple measure against out-of-order responses
       // to the autocompletion, we count queries and make sure
@@ -302,7 +303,7 @@ export default {
       <template v-for="s in autocomplete.sections">
         <li class="divider" v-bind:data-content="s.name"></li>
         <template v-for="(e, i) in s.entries">
-          <li v-if="s.n_visible === undefined || i < s.n_visible || s.expanded" class="menu-item">
+          <li v-if="s.facet === 'rooms' || i < s.n_visible || s.expanded" class="menu-item">
             <a
               v-bind:class="{
                 active: e.id === autocomplete.highlighted,
diff --git a/webclient/src/components/DetailsFeaturedSection.vue b/webclient/src/components/DetailsFeaturedSection.vue
index e64e4cfd1..2f190425e 100644
--- a/webclient/src/components/DetailsFeaturedSection.vue
+++ b/webclient/src/components/DetailsFeaturedSection.vue
@@ -1,7 +1,11 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { useDetailsStore } from "@/stores/details";
+
+const state = useDetailsStore();
+</script>
 
 <template>
-  <div v-if="state.data.sections?.featured">
+  <div v-if="state.data?.sections?.featured">
     <div class="columns" style="margin-top: 40px">
       <div class="column"><h2>Featured</h2></div>
     </div>
diff --git a/webclient/src/components/DetailsFeedbackButton.vue b/webclient/src/components/DetailsFeedbackButton.vue
index 9701e32fb..98dd2bf49 100644
--- a/webclient/src/components/DetailsFeedbackButton.vue
+++ b/webclient/src/components/DetailsFeedbackButton.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
 import { getLocalStorageWithExpiry } from "@/utils/storage";
 import { useDetailsStore } from "@/stores/details";
-import { useGlobalStore } from "@/stores/global";
+import { useGlobalStore} from "@/stores/global";
+import { useI18n } from "vue-i18n";
+import type {Coord} from "@/stores/global";
 import type { components } from "@/api_types";
 type TokenRequest = components["schemas"]["TokenRequest"];
 
-import { useI18n } from "vue-i18n";
 const { t } = useI18n();
 const state = useDetailsStore();
 function _getFeedbackSubject(currentEdits) {
@@ -77,12 +78,12 @@ defineExpose({
 function openFeedbackForm(addLocationPicker) {
   // The feedback form is opened. This may be prefilled with previously corrected coordinates.
   // Maybe get the old coordinates from localstorage
-  const currentEdits = getLocalStorageWithExpiry("feedback-coords", {});
+  const currentEdits = getLocalStorageWithExpiry<{ [index: string]: Coord }>("feedback-coords", {});
   const body = _getFeedbackBody(currentEdits);
   const subject = _getFeedbackSubject(currentEdits);
 
   window.setTimeout(
-    () => document.getElementById("feedback-coordinate-picker").addEventListener("click", addLocationPicker),
+    () => document.getElementById("feedback-coordinate-picker")?.addEventListener("click", addLocationPicker),
     100
   );
 
diff --git a/webclient/src/components/DetailsInfoSection.vue b/webclient/src/components/DetailsInfoSection.vue
index 861e86c7d..dfda30f67 100644
--- a/webclient/src/components/DetailsInfoSection.vue
+++ b/webclient/src/components/DetailsInfoSection.vue
@@ -6,7 +6,7 @@ const state = useDetailsStore();
 
 <template>
   <!-- Information section (on mobile) -->
-  <div class="column col-5 col-sm-12 show-sm mobile-info-section" v-if="state.data.props?.computed">
+  <div class="column col-5 col-sm-12 show-sm mobile-info-section" v-if="state.data?.props?.computed">
     <h2>Informationen</h2>
     <table class="info-table">
       <tbody>
@@ -59,7 +59,7 @@ const state = useDetailsStore();
       <a
         class="card-image c-hand"
         @click="state.showImageSlideshow(state.image.shown_image_id)"
-        v-if="state.image.shown_image"
+        v-if="state.image.shown_image_id"
       >
         <img
           alt="Header-Image, showing the building"
@@ -230,7 +230,7 @@ const state = useDetailsStore();
             </div>
             <div class="carousel-nav">
               <label
-                v-for="(_, i) in state.data.imgs"
+                v-for="(_, i) in state.data?.imgs"
                 class="nav-item text-hide c-hand"
                 v-bind:for="'slide-' + (i + 1)"
                 >{{ i + 1 }}</label
@@ -243,21 +243,21 @@ const state = useDetailsStore();
         <div class="columns">
           <div class="column col-4 col-sm-6 col-md-6 text-left">
             <h6>{{ $t("view_view.slideshow.source") }}</h6>
-            <a v-if="state.image.shown_image.source.url" v-bind:href="state.image.shown_image.source.url">{{
+            <a v-if="state.image.shown_image?.source.url" v-bind:href="state.image.shown_image.source.url">{{
               state.image.shown_image.source.text
             }}</a>
             <template v-else>{{ state.image.shown_image.source.text }}</template>
           </div>
           <div class="column col-4 col-sm-6 col-md-6 text-center text-md-right">
             <h6>{{ $t("view_view.slideshow.author") }}</h6>
-            <a v-if="state.image.shown_image.author.url" v-bind:href="state.image.shown_image.author.url">{{
+            <a v-if="state.image.shown_image?.author.url" v-bind:href="state.image.shown_image.author.url">{{
               state.image.shown_image.author.text
             }}</a>
             <template v-else>{{ state.image.shown_image.author.text }}</template>
           </div>
           <div class="column col-4 col-sm-12 col-md-12 text-md-center mt-md-3">
             <h6>{{ $t("view_view.slideshow.license") }}</h6>
-            <a v-if="state.image.shown_image.license.url" v-bind:href="state.image.shown_image.license.url">{{
+            <a v-if="state.image.shown_image?.license.url" v-bind:href="state.image.shown_image.license.url">{{
               state.image.shown_image.license.text
             }}</a>
             <template v-else>{{ state.image.shown_image.license.text }}</template>
diff --git a/webclient/src/components/DetailsInteractiveMap.vue b/webclient/src/components/DetailsInteractiveMap.vue
index 806ee8fe6..5854b98d4 100644
--- a/webclient/src/components/DetailsInteractiveMap.vue
+++ b/webclient/src/components/DetailsInteractiveMap.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
 import { getLocalStorageWithExpiry, setLocalStorageWithExpiry } from "@/utils/storage";
 import maplibregl from "maplibre-gl";
-import type { BackgroundLayer, Map, Marker, ImageSource } from "maplibre-gl";
 import { selectedMap, useDetailsStore } from "@/stores/details";
 import { useGlobalStore } from "@/stores/global";
 import { nextTick, ref } from "vue";
 import { FloorControl } from "@/modules/FloorControl";
-const map = ref<Map | undefined>(undefined);
+import type { Coordinates, BackgroundLayerSpecification, Map, Marker, ImageSource } from "maplibre-gl";
+import type { Coord } from "@/stores/global";
 
+const map = ref<Map | undefined>(undefined);
 const marker = ref<Marker | undefined>(undefined);
 const marker2 = ref<Marker | null>(null);
 const floorControl = ref<FloorControl>(new FloorControl());
@@ -26,12 +27,6 @@ const coord_picker = ref({
 });
 const initialLoaded = ref(false);
 
-type Coord = {
-  coords: {
-    lat: number | undefined;
-    lon: number | undefined;
-  };
-};
 const emit = defineEmits(["openFeedbackForm"]);
 function confirmLocationPicker() {
   // add the current edits to the feedback
@@ -94,7 +89,7 @@ function addLocationPicker() {
   if (marker2.value === null) {
     // Coordinates are either taken from the entry, or if there are already
     // some in the localStorage use them
-    const currentEdits = getLocalStorageWithExpiry("feedback-coords", {});
+    const currentEdits = getLocalStorageWithExpiry<{ [index: string]: Coord }>("feedback-coords", {});
 
     const { coords } = currentEdits[state.data.id] || state.data;
     marker2.value = new maplibregl.Marker({
@@ -200,11 +195,11 @@ function initMap(containerId: string) {
   // container to maximize, and then remains unchanged even if the browser
   // is resized (not relevant for users but for developers).
   const isMobile = window.matchMedia && window.matchMedia("only screen and (max-width: 480px)").matches;
-
+  const fullscreenContainer = isMobile
+    ? document.getElementById("interactive-map")
+    : document.getElementById("interactive-map-container");
   const fullscreenCtl = new maplibregl.FullscreenControl({
-    container: isMobile
-      ? document.getElementById("interactive-map")
-      : document.getElementById("interactive-map-container"),
+    container: fullscreenContainer as HTMLElement,
   });
   // "Backup" the maplibregl default fullscreen handler
   const defaultOnClickFullscreen = fullscreenCtl._onClickFullscreen;
@@ -217,8 +212,8 @@ function initMap(containerId: string) {
       } else {
         fullscreenCtl._container.classList.add("maximize");
         document.body.classList.add("no-scroll");
-        // "instant" is not part of the spec but nonetheless implemented
-        // by Firefox and Chrome
+        // "instant" is not part of the spec but nonetheless implemented by Firefox/Chrome
+        // @ts-expect-error: TS2322
         window.scrollTo({ top: 0, behavior: "instant" });
       }
 
@@ -242,7 +237,6 @@ function initMap(containerId: string) {
       enableHighAccuracy: true,
     },
     trackUserLocation: true,
-    showUserHeading: true,
   });
   map.addControl(location);
 
@@ -265,7 +259,7 @@ function initMap(containerId: string) {
 
   interface FloorChangedEvent {
     file: string | null;
-    coords: number[][] | undefined;
+    coords: Coordinates | undefined;
   }
 
   floorControl.value.on("floor-changed", (args: FloorChangedEvent) => {
@@ -279,7 +273,7 @@ function initMap(containerId: string) {
 
 // Set the currently visible overlay image in the map,
 // or hide it if imgUrl is null.
-function setOverlayImage(imgUrl: string | null, coords: number[][] | undefined) {
+function setOverlayImage(imgUrl: string | null, coords: Coordinates | undefined) {
   // Even if the map is initialized, it could be that
   // it hasn't loaded yet, so we need to postpone adding
   // the overlay layer.
@@ -311,7 +305,7 @@ function setOverlayImage(imgUrl: string | null, coords: number[][] | undefined)
         coordinates: coords,
       });
 
-    const layer = map.value!.getLayer("overlay-layer") as BackgroundLayer | undefined;
+    const layer = map.value!.getLayer("overlay-layer") as BackgroundLayerSpecification | undefined;
     if (!layer) {
       map.value!.addLayer({
         id: "overlay-bg",
diff --git a/webclient/src/components/DetailsOverviewSections.vue b/webclient/src/components/DetailsOverviewSections.vue
index 38d9186c2..5b4c39e9e 100644
--- a/webclient/src/components/DetailsOverviewSections.vue
+++ b/webclient/src/components/DetailsOverviewSections.vue
@@ -1,65 +1,45 @@
 <script setup lang="ts">
-import { ref, reactive, computed, watch } from "vue";
+import { ref, computed, watch } from "vue";
 import { useDetailsStore } from "@/stores/details";
-
+type RoomChild = { readonly id: string; readonly name: string };
 const state = useDetailsStore();
 const combined_list = computed(() => {
   if (!state.data) return [];
 
-  const usages = state.data.sections.rooms_overview.usages;
-  const combinedList = [];
+  const usages = state.data?.sections?.rooms_overview?.usages || [];
+  const combinedList = [] as RoomChild[];
   usages.forEach((usage) => {
     combinedList.push(...usage.children);
   });
   return combinedList;
 });
 
-const display_list = ref([]);
-const filter = reactive({
-  search: "",
-  selected: null,
-  list: [],
-});
-const selected = ref(null);
+const display_list = ref([] as RoomChild[]);
+const search = ref("");
+const selected = ref(null as number | null);
 const loading = ref(true);
 const buildings_overview_expanded = ref(false);
 
 watch(
-  () => filter.search,
-  () => updateRoomsOverview
+  () => [search.value, selected.value],
+  () => updateRoomsOverview()
 );
-
-updateRoomsOverview();
-function updateRoomsOverview(setSelected = undefined) {
+function updateRoomsOverview() {
+  console.log("updateRoomsOverview");
   const rooms_overview = state.data?.sections?.rooms_overview;
   if (!rooms_overview) return;
 
-  if (setSelected !== undefined) selected.value = setSelected;
-
   if (selected.value === null) {
     display_list.value = [];
   } else {
     const rooms = selected.value === -1 ? combined_list.value : rooms_overview.usages[selected.value].children;
-    if (filter.search === "") {
+    if (search.value === "") {
       display_list.value = rooms;
     } else {
-      // Update filter index if required
-      if (selected.value !== filter.selected) {
-        filter.list = [];
-
-        rooms.forEach((room) => {
-          room._lower = room.name.toLowerCase();
-          filter.list.push(room);
-        });
-        filter.selected = selected.value;
-      }
-
-      const search_term = filter.search.toLowerCase();
-      const filtered = [];
+      const search_term = new RegExp(`.*${search.value}.*`, "i"); // i=>case insensitive
+      const filtered = [] as RoomChild[];
 
-      filter.list.forEach((f) => {
-        if (f._lower.indexOf(search_term) >= 0) filtered.push(f);
-      });
+      rooms.filter((f) => search_term.test(f.name)).forEach((f) => filtered.push(f));
       display_list.value = filtered;
     }
   }
@@ -86,7 +66,7 @@ function updateRoomsOverview(setSelected = undefined) {
 
 <template>
   <!-- Buildings overview -->
-  <section v-if="state.data.sections?.buildings_overview" id="building-overview">
+  <section v-if="state.data?.sections?.buildings_overview" id="building-overview">
     <div class="columns">
       <div class="column">
         <h2>{{ $t("view_view.buildings_overview.title") }}</h2>
@@ -173,7 +153,7 @@ function updateRoomsOverview(setSelected = undefined) {
                   v-bind:class="{
                     active: selected === -1,
                   }"
-                  @click="updateRoomsOverview(-1)"
+                  @click="selected = -1"
                 >
                   <i class="icon icon-arrow-right"></i>
                   <div class="menu-text">
@@ -189,7 +169,7 @@ function updateRoomsOverview(setSelected = undefined) {
                   v-bind:class="{
                     active: i === state.data.sections.rooms_overview.selected,
                   }"
-                  @click="updateRoomsOverview(i)"
+                  @click="selected = i"
                 >
                   <i class="icon icon-arrow-right"></i>
                   <div class="menu-text">{{ u.name }}</div>
@@ -199,7 +179,7 @@ function updateRoomsOverview(setSelected = undefined) {
             </ul>
           </div>
           <div class="panel-footer">
-            <button class="btn btn-link btn-sm" @click="updateRoomsOverview(null)">
+            <button class="btn btn-link btn-sm" @click="selected = null">
               {{ $t("view_view.rooms_overview.remove_selection") }}
             </button>
           </div>
@@ -210,12 +190,8 @@ function updateRoomsOverview(setSelected = undefined) {
         <div class="panel">
           <div class="panel-header">
             <div class="input-group">
-              <input
-                v-model="filter.search"
-                v-bind:placeholder="$t('view_view.rooms_overview.filter')"
-                class="form-input"
-              />
-              <button class="btn btn-primary input-group-btn" @click="filter.search = ''" aria-label="Clear the filter">
+              <input v-model="search" v-bind:placeholder="$t('view_view.rooms_overview.filter')" class="form-input" />
+              <button class="btn btn-primary input-group-btn" @click="search = ''" aria-label="Clear the filter">
                 <i class="icon icon-cross"></i>
               </button>
             </div>
@@ -237,7 +213,7 @@ function updateRoomsOverview(setSelected = undefined) {
                     " " +
                     $t("view_view.rooms_overview.result") +
                     (display_list.length === 1 ? "" : $t("view_view.rooms_overview.results_suffix")) +
-                    (filter.search === "" ? "" : $t("view_view.rooms_overview.filtered"))
+                    (search === "" ? "" : $t("view_view.rooms_overview.filtered"))
               }}
             </small>
           </div>
diff --git a/webclient/src/components/FeedbackModal.vue b/webclient/src/components/FeedbackModal.vue
index 7a92cd028..67fa0f7bb 100644
--- a/webclient/src/components/FeedbackModal.vue
+++ b/webclient/src/components/FeedbackModal.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { useGlobalStore } from "@/stores/global";
+import { watch, ref, reactive } from "vue";
 import { useI18n } from "vue-i18n";
 const { t } = useI18n({
   inheritLocale: true,
   useScope: "global",
 });
-import { watch, ref, reactive } from "vue";
 
 const global = useGlobalStore();
 const loading = ref(false);
@@ -53,7 +53,7 @@ _assuereTokenValidity();
 watch(() => global.feedback.open, _assuereTokenValidity);
 function _assuereTokenValidity() {
   if (token.value === null) {
-    token.value = getLocalStorageWithExpiry("feedback-token", null);
+    token.value = getLocalStorageWithExpiry<Token | null>("feedback-token", null);
   }
   if (token.value === null || Date.now() - token.value.creation > 1000 * 3600 * 6) {
     _requestPage(
@@ -169,7 +169,7 @@ function sendForm() {
 </script>
 
 <template>
-  <div class="modal active" id="feedback-modal" v-if="!successUrl.value">
+  <div class="modal active" id="feedback-modal" v-if="!successUrl">
     <div id="feedback-overlay modal-overlay" @click="mayCloseForm"></div>
     <div class="modal-container">
       <div class="modal-header">
@@ -240,6 +240,7 @@ function sendForm() {
                   features: t("feedback.helptext.features"),
                   search: t("feedback.helptext.search"),
                   entry: t("feedback.helptext.entry"),
+                  other: t("feedback.helptext.other"), // This is only here to make the linter happy, backend uses "other" as a fallback if the category is not known
                 }[global.feedback.category]
               }}
             </p>
@@ -281,7 +282,7 @@ function sendForm() {
       </div>
     </div>
   </div>
-  <div class="modal active" id="feedback-success-modal" v-if="successUrl.value">
+  <div class="modal active" id="feedback-success-modal" v-if="successUrl">
     <div class="feedback-overlay modal-overlay" @click="closeForm"></div>
     <div class="modal-container">
       <div class="modal-header">
@@ -293,7 +294,7 @@ function sendForm() {
           <p>{{ $t("feedback.success.thank_you") }}</p>
           <p>
             {{ $t("feedback.success.response_at") }}
-            <a id="feedback-success-url" class="btn-link" v-bind:href="successUrl.value">{{
+            <a id="feedback-success-url" class="btn-link" v-bind:href="successUrl">{{
               $t("feedback.success.this_issue")
             }}</a>
           </p>
diff --git a/webclient/src/components/ShareButton.vue b/webclient/src/components/ShareButton.vue
index 029d8c298..7e437fb96 100644
--- a/webclient/src/components/ShareButton.vue
+++ b/webclient/src/components/ShareButton.vue
@@ -1,27 +1,21 @@
-<script lang="ts">
+<script setup lang="ts">
 import { copyCurrentLink } from "@/utils/common";
+import { ref } from "vue";
 
-export default {
-  props: ["coords"],
-  data() {
-    return {
-      browser_supports_share: "share" in navigator,
-      copied: false,
-    };
-  },
-  methods: {
-    shareLink: function () {
-      if (navigator.share) {
-        navigator.share({
-          title: this.view_data.name,
-          text: document.title,
-          url: window.location.href,
-        });
-      }
-    },
-    copyCurrentLink: copyCurrentLink,
-  },
-};
+const props = defineProps(["coords", "name"]);
+
+const browser_supports_share = "share" in navigator;
+const copied = ref(false);
+
+function shareLink() {
+  if (navigator.share) {
+    navigator.share({
+      title: props.name,
+      text: document.title,
+      url: window.location.href,
+    });
+  }
+}
 </script>
 
 <template>
@@ -58,8 +52,8 @@ export default {
     </button>
     <button
       class="btn"
-      @click="copyCurrentLink(copied)"
-      v-html="copied ? $t('view_view.header.external_link.copied') : $t('view_view.header.copy_link')"
+      @click="copyLink()"
+      v-html="copyCurrentLink(copied) ? $t('view_view.header.external_link.copied') : $t('view_view.header.copy_link')"
     ></button>
   </div>
 </template>
diff --git a/webclient/src/locales/de.yaml b/webclient/src/locales/de.yaml
index a701e0093..cdb118630 100644
--- a/webclient/src/locales/de.yaml
+++ b/webclient/src/locales/de.yaml
@@ -55,6 +55,7 @@ feedback:
     features: "Features, die du gerne auf dieser Website haben würdest"
     search: "Feedback zur Suche. Was war dein Suchbegriff? Was hättest du als Ergebnis erwartet?"
     entry: "Feedback zu einem Eintrag. Wir können Räume/Gebäude/Standorte hinzufügen und alle Daten, die du siehst (Namen, Koordinaten, Adressen, ...) anpassen. Was können wir verbessern?"
+    other: "Feedback ist auf ein Problem gestoßen: Kategorie ungültig"
   coordinatepicker:
     helptext: "Falls du mehrere Koordinaten gleichzeitig korrigieren willst, kannst du dieses Fenster schließen und weitere Koordinaten editieren. Wir speichern deine Veränderungen für 12 Stunden bei dir lokal. <br> Achtung, das gilt nur für Koordinaten!"
     title: "Koordinate auswählen"
diff --git a/webclient/src/locales/en.yaml b/webclient/src/locales/en.yaml
index 6ed57f1cb..39718108b 100644
--- a/webclient/src/locales/en.yaml
+++ b/webclient/src/locales/en.yaml
@@ -55,6 +55,7 @@ feedback:
     features: "Features you would like to see on this website"
     search: "Feedback about the search. What was your search query? What did you expect to see?"
     entry: "Feedback about an entry. We can add rooms/buildings/locations and adjust all data you see (names, coordinates, addresses, ...). What can we improve?"
+    other: "Feedback encountered issue: Category invalid"
   coordinatepicker:
     helptext: "If you want to correct several coordinates at the same time, you can close this window and edit more coordinates. <br> We will save your changes locally for 12 hours. <br> Warning, that's only valid for coordinates!"
     title: "Select coordinate"
diff --git a/webclient/src/modules/FloorControl.ts b/webclient/src/modules/FloorControl.ts
index 0253fb180..dcac2cdd0 100644
--- a/webclient/src/modules/FloorControl.ts
+++ b/webclient/src/modules/FloorControl.ts
@@ -1,8 +1,11 @@
 import { Evented } from "maplibre-gl";
 import type { Map, IControl } from "maplibre-gl";
 import type { components } from "@/api_types";
-type OverlayMap = components["schemas"]["OverlayMap"];
 type OverlayMapEntry = components["schemas"]["OverlayMapEntry"];
+type OverlayMap = {
+  readonly default: number | null;
+  readonly available: OverlayMapEntry[];
+};
 // In reality, this extends maplibregl.Control, but this is apparently not working
 export class FloorControl extends Evented implements IControl {
   private readonly container: HTMLDivElement;
@@ -87,7 +90,7 @@ export class FloorControl extends Evented implements IControl {
     };
     let btn;
     let visibleI = null;
-    overlays.available.reverse().forEach((floor, index: number) => {
+    overlays.available.reverse().forEach((floor: OverlayMapEntry, index: number) => {
       btn = document.createElement("button");
       btn.innerText = floor.floor;
       btn.addEventListener("click", clickHandlerBuilder(overlays.available, index));
diff --git a/webclient/src/modules/autocomplete.ts b/webclient/src/modules/autocomplete.ts
index 0dbd253ea..d5c649e82 100644
--- a/webclient/src/modules/autocomplete.ts
+++ b/webclient/src/modules/autocomplete.ts
@@ -1,6 +1,9 @@
 import type { components } from "@/api_types";
+import type { useI18n } from "vue-i18n";
 type SearchResponse = components["schemas"]["SearchResponse"];
-
+type RoomEntry = components["schemas"]["RoomEntry"];
+type translation = ReturnType<typeof useI18n>["t"];
+type SitesBuildingsEntry = components["schemas"]["SitesBuildingsEntry"];
 function _allowHighlighting(text: string) {
   /// This function does still parse content only from our internal API (which should not try to pawn us in the
   // first place), but for extra redundancy we sanitise this anyway.
@@ -11,50 +14,72 @@ function _allowHighlighting(text: string) {
 
 export type SectionFacet = RoomFacet | SiteBuildingFacet;
 type RoomFacet = {
+  facet: "rooms";
+  name: string;
+  entries: EntryFacet[];
+  estimatedTotalHits: number;
+};
+type SiteBuildingFacet = {
+  facet: "sites_buildings";
   name: string;
   entries: EntryFacet[];
   estimatedTotalHits: number;
+  expanded: false;
+  n_visible: number;
 };
-type SiteBuildingFacet = RoomFacet & { expanded: false; n_visible: number };
 type EntryFacet = {
   id: string;
   name: string;
   type: string;
   subtext: string;
-  subtext_bold: string;
-  parsed_id: string;
+  subtext_bold: string | null;
+  parsed_id: string | null;
 };
 
-export function extractFacets(data: SearchResponse, t) {
+export function extractFacets(data: SearchResponse, t: translation) {
   const sections: SectionFacet[] = [];
 
   data.sections.forEach((section) => {
     const entries: EntryFacet[] = [];
 
-    section.entries.forEach((entry) => {
-      entries.push({
-        id: entry.id,
-        name: _allowHighlighting(entry.name), // we explicitly dont let vue sanitise this text
-        type: entry.type,
-        subtext: entry.subtext,
-        subtext_bold: _allowHighlighting(entry.subtext_bold), // we explicitly dont let vue sanitise this text
-        parsed_id: _allowHighlighting(entry.parsed_id), // we explicitly dont let vue sanitise this text
-      });
-    });
-    if (section.facet === "sites_buildings") {
-      sections.push({
-        name: t("search.sections.buildings"),
-        expanded: false,
-        entries: entries,
-        estimatedTotalHits: section.estimatedTotalHits,
-        n_visible: section.n_visible,
-      });
-    } else if (section.facet === "rooms") {
-      sections.push({
-        name: t("search.sections.rooms"),
-        entries: entries,
-        estimatedTotalHits: section.estimatedTotalHits,
-      });
+    switch (section.facet) {
+      case "rooms":
+        section.entries.forEach((entry: RoomEntry) => {
+          entries.push({
+            id: entry.id,
+            name: _allowHighlighting(entry.name), // we explicitly dont let vue sanitise this text
+            type: entry.type,
+            subtext: entry.subtext,
+            subtext_bold: _allowHighlighting(entry.subtext_bold), // we explicitly dont let vue sanitise this text
+            parsed_id: _allowHighlighting(entry.parsed_id || ""), // we explicitly dont let vue sanitise this text
+          });
+        });
+        sections.push({
+          facet: "rooms",
+          name: t("search.sections.rooms"),
+          entries: entries,
+          estimatedTotalHits: section.estimatedTotalHits,
+        });
+        break;
+      case "sites_buildings":
+        section.entries.forEach((entry: SitesBuildingsEntry) => {
+          entries.push({
+            id: entry.id,
+            name: _allowHighlighting(entry.name), // we explicitly dont let vue sanitise this text
+            type: entry.type,
+            subtext: entry.subtext,
+            subtext_bold: null,
+            parsed_id: null,
+          });
+        });
+        sections.push({
+          facet: "sites_buildings",
+          name: t("search.sections.buildings"),
+          expanded: false,
+          entries: entries,
+          estimatedTotalHits: section.estimatedTotalHits,
+          n_visible: section.n_visible || entries.length,
+        });
     }
   });
 
diff --git a/webclient/src/modules/outdatedBrowser.ts b/webclient/src/modules/outdatedBrowser.ts
index ffb0a8415..eec070ee3 100644
--- a/webclient/src/modules/outdatedBrowser.ts
+++ b/webclient/src/modules/outdatedBrowser.ts
@@ -5,13 +5,13 @@ function extractBrowserInfo() {
 
   if (/trident/i.test(M[1])) {
     tem = /\brv[ :]+(\d+)/g.exec(ua) || [];
-    return { name: "IE", version: tem[1] || "" };
+    return { name: "IE", version: +tem[1] || 0 };
   }
 
   if (M[1] === "Chrome") {
     tem = ua.match(/\b(OPR|Edge)\/(\d+)/);
     if (tem != null) {
-      return { name: tem[1].replace("OPR", "Opera"), version: tem[2] };
+      return { name: tem[1].replace("OPR", "Opera"), version: +tem[2] };
     }
   }
 
@@ -21,38 +21,43 @@ function extractBrowserInfo() {
     M.splice(1, 1, tem[1]);
   }
 
-  return { name: M[0], version: M[1] };
+  return { name: M[0], version: +M[1] };
 }
 
-const minSupportedBrowsers = {
-  Chrome: 98,
-  Firefox: 94,
-  Edge: 98,
-  Opera: 84,
-  Safari: 15.3,
-};
-
-function isUnSupportedBrowser() {
-  const browser = extractBrowserInfo();
-  const browserNameIsKnown = minSupportedBrowsers.hasOwnProperty(browser.name);
-  return browserNameIsKnown && +browser.version < minSupportedBrowsers[browser.name];
+function isSupportedBrowser(browserName: string, browserVersion: number) {
+  switch (browserName) {
+    case "Chrome":
+      return 98 >= browserVersion;
+    case "Firefox":
+      return 94 >= browserVersion;
+    case "Edge":
+      return 98 >= browserVersion;
+    case "Opera":
+      return 84 >= browserVersion;
+    case "Safari":
+      return 15.3 >= browserVersion;
+    default:
+      return false;
+  }
 }
 
 function shouldWarn() {
-  if (!isUnSupportedBrowser()) return false;
-  const lastTime = localStorage.getItem("lastOutdatedBrowserWarningTime");
-  if (lastTime === null) return true;
-
-  const currentTime = new Date().getTime();
-  const daysSinceLastWarning = (currentTime - Date(lastTime)) / (1000 * 60 * 60 * 24);
+  const browser = extractBrowserInfo();
+  if (isSupportedBrowser(browser.name, browser.version)) return false;
+  const optLastTime = localStorage.getItem("lastOutdatedBrowserWarningTime");
+  if (optLastTime === null) return true;
+  const lastTime = new Date(optLastTime);
+
+  const currentTime: Date = new Date();
+  const msSinceLastWarning = currentTime.getTime() - lastTime.getTime();
+  const daysSinceLastWarning = msSinceLastWarning / (1000 * 60 * 60 * 24);
   return daysSinceLastWarning > 1;
 }
 
 if (shouldWarn()) {
-  const parent = document.getElementById("errorToasts");
   const error = document.createElement("div");
   error.classList.add("toast", "toast-error");
   error.innerHTML = "${{_.core_js.error.browser_outdated}}$";
-  parent.appendChild(error);
+  document.getElementById("errorToasts")?.appendChild(error);
   localStorage.setItem("lastOutdatedBrowserWarningTime", new Date().getTime().toString());
 }
diff --git a/webclient/src/stores/global.ts b/webclient/src/stores/global.ts
index 7de15d7bb..dd0543642 100644
--- a/webclient/src/stores/global.ts
+++ b/webclient/src/stores/global.ts
@@ -2,6 +2,12 @@ import { defineStore } from "pinia";
 import type { components } from "@/api_types";
 type TokenRequest = components["schemas"]["TokenRequest"];
 
+export type Coord = {
+  coords: {
+    lat: number | undefined;
+    lon: number | undefined;
+  };
+};
 export const useGlobalStore = defineStore({
   id: "global",
   state: () => ({
diff --git a/webclient/src/utils/storage.ts b/webclient/src/utils/storage.ts
index 2b2395d17..85a1d7c81 100644
--- a/webclient/src/utils/storage.ts
+++ b/webclient/src/utils/storage.ts
@@ -14,7 +14,7 @@ export function setLocalStorageWithExpiry(key: string, value: any, ttl: number)
   window.dispatchEvent(e);
 }
 
-export function getLocalStorageWithExpiry<T>(key: string, defaultValue: T | null = null): T | null {
+export function getLocalStorageWithExpiry<T>(key: string, defaultValue: T): T {
   const itemStr = localStorage.getItem(key);
   if (!itemStr) return defaultValue;
   const item = JSON.parse(itemStr);
diff --git a/webclient/src/views/AboutView.vue b/webclient/src/views/AboutView.vue
index c999dbabb..5bcb58626 100644
--- a/webclient/src/views/AboutView.vue
+++ b/webclient/src/views/AboutView.vue
@@ -1,8 +1,18 @@
 <script setup lang="ts">
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import Datenschutz from "../assets/md/datenschutz.md";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import Privacy from "../assets/md/privacy.md";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import AboutUs from "../assets/md/about-us.md";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import UeberUns from "../assets/md/ueber-uns.md";
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 import Impressum from "../assets/md/impressum.md";
 
 import { ref } from "vue";
diff --git a/webclient/src/views/DetailsView.vue b/webclient/src/views/DetailsView.vue
index 8b368d3f2..3d668434f 100644
--- a/webclient/src/views/DetailsView.vue
+++ b/webclient/src/views/DetailsView.vue
@@ -11,12 +11,13 @@ import { useI18n } from "vue-i18n";
 import { getLocalStorageWithExpiry, removeLocalStorage } from "@/utils/storage";
 import { copyCurrentLink, setDescription, setTitle } from "@/utils/common";
 import { selectedMap, useDetailsStore } from "@/stores/details";
-import type { components } from "@/api_types";
-type DetailsResponse = components["schemas"]["DetailsResponse"];
 import { nextTick, onMounted, ref, watch } from "vue";
 import { useFetch } from "@/utils/fetch";
 import { useRoute } from "vue-router";
 import router from "@/router";
+import type { components } from "@/api_types";
+type DetailsResponse = components["schemas"]["DetailsResponse"];
+import type {Coord} from "@/stores/global";
 
 const { t } = useI18n({
   inheritLocale: true,
@@ -59,10 +60,6 @@ function update() {
   });
 }
 
-function copyLink(copied) {
-  copyCurrentLink(copied);
-}
-
 const state = useDetailsStore();
 const copied = ref(false);
 // Coordinate picker states
@@ -103,7 +100,7 @@ onMounted(() => {
 
   // Update pending coordinate counter on localStorage changes
   const updateCoordinateCounter = function () {
-    const coords = getLocalStorageWithExpiry("feedback-coords", {});
+    const coords = getLocalStorageWithExpiry<{ [index: string]: Coord }>("feedback-coords", {});
     coord_counter.value.counter = Object.keys(coords).length;
   };
   window.addEventListener("storage", updateCoordinateCounter);
@@ -220,7 +217,7 @@ onMounted(() => {
           <button
             class="btn btn-link btn-action btn-sm"
             v-bind:title="$t('view_view.header.copy_link')"
-            @click="copyLink(copied)"
+            @click="copyCurrentLink(copied)"
           >
             <i class="icon icon-check" v-if="copied"></i>
             <i class="icon icon-link" v-else></i>
@@ -239,7 +236,7 @@ onMounted(() => {
           <a
             class="btn btn-link btn-action btn-sm"
             v-if="state.data.props?.calendar_url"
-            v-bind:href="state.data.props.calendar_url"
+            v-bind:href="state.data?.props.calendar_url"
             target="_blank"
             v-bind:title="$t('view_view.header.calendar')"
           >
@@ -280,7 +277,7 @@ onMounted(() => {
               <path d="M2.352.268h1.085v1.085" stroke-linejoin="round" />
             </svg>
           </button>
-          <ShareButton v-bind:coords="state.data.coords" />
+          <ShareButton v-bind:coords="state.data.coords" v-bind:name="state.data.name" />
           <DetailsFeedbackButton ref="feedbackButton" />
           <!--<button class="btn btn-link btn-action btn-sm"
                   v-bind:title="$t('view_view.header.favorites')">
diff --git a/webclient/src/views/SearchView.vue b/webclient/src/views/SearchView.vue
index 09490fbf5..f28fa4700 100644
--- a/webclient/src/views/SearchView.vue
+++ b/webclient/src/views/SearchView.vue
@@ -3,16 +3,17 @@ import { useFetch } from "@/utils/fetch";
 import { ref } from "vue";
 import { setDescription, setTitle } from "@/utils/common";
 import { extractFacets } from "@/modules/autocomplete";
+import { useGlobalStore } from "@/stores/global";
+import { useI18n } from "vue-i18n";
 import type { SectionFacet } from "@/modules/autocomplete";
 import type { components } from "@/api_types";
 type SearchResponse = components["schemas"]["SearchResponse"];
-import { useGlobalStore } from "@/stores/global";
-const global = useGlobalStore();
-import { useI18n } from "vue-i18n";
+
 const { t } = useI18n({
   inheritLocale: true,
   useScope: "global",
 });
+const global = useGlobalStore();
 
 const query: string = new URLSearchParams(document.location.search).get("q") || "";
 
diff --git a/webclient/vite.config.ts b/webclient/vite.config.ts
index ac9829185..fdaa38893 100644
--- a/webclient/vite.config.ts
+++ b/webclient/vite.config.ts
@@ -29,9 +29,11 @@ export default defineConfig({
   build: {
     rollupOptions: {
       input: path.resolve(__dirname, "./index.html"),
-      manualChunks: {
-        maplibre_gl: ["maplibre-gl"],
-        swagger_ui_dist: ["swagger-ui-dist"],
+      output: {
+        manualChunks: {
+          maplibre_gl: ["maplibre-gl"],
+          swagger_ui_dist: ["swagger-ui-dist"],
+        },
       },
     },
   },