diff --git a/browser_action.js b/browser_action.js
index 39e0146..f249fd3 100644
--- a/browser_action.js
+++ b/browser_action.js
@@ -3,7 +3,7 @@ browser.browserAction.onClicked.addListener(() => {
       url: "cal.html",
       type: "detached_panel", // oder "popup"
       width: 420, 
-      height: 800  
+      height: 870  
     });
   });
   
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 9279363..8293635 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "j-lawyer.org-Thunderbird-Extension",
-  "version": "0.9.9.7",
+  "version": "0.9.9.8",
   "description": "Sendet E-Mails an einen j-lawyer.org Server",
   "author": "Maximilian Steinert",
   "icons": {
diff --git a/popup.js b/popup.js
index 0eb2a3c..68700df 100644
--- a/popup.js
+++ b/popup.js
@@ -191,9 +191,8 @@ document.addEventListener("DOMContentLoaded", async function() {
                     browser.storage.local.set({
                         calendars: calendarsRaw
                     });
-                   
-                    // Kalenderdaten in jeweilige Arrays filtern und wieder speichern
-                    
+
+                    // Kalenderdaten in jeweilige Arrays filtern und wieder speichern                    
                     // Filtern und Extrahieren der Daten für Wiedervorlagen
                     const followUpCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'FOLLOWUP')
@@ -216,6 +215,7 @@ document.addEventListener("DOMContentLoaded", async function() {
                         console.log(eventCalendars);
                         browser.storage.local.set({ eventCalendars });
                     console.log("Kalender heruntergeladen: " + calendarsRaw);
+                    
                 });
                 getUsers(result.username, result.password, result.serverAddress).then(data => {
                     const users = data.map(item => item.displayName);
@@ -433,12 +433,13 @@ document.getElementById("searchInput").addEventListener("input", function() {
     if (query) {
         searchCases(query);
     } else {
-        document.getElementById("resultsList").innerHTML = "";
+        document.getElementById("resultsList").textContent = "";
     }
 });
 
 
 
+
 // Funktion zum Suchen von Fällen
 async function searchCases(query) {
     document.getElementById("resultsList").style.display = "block";
diff --git a/popup_compose.js b/popup_compose.js
index b4e0159..28302dd 100644
--- a/popup_compose.js
+++ b/popup_compose.js
@@ -95,32 +95,29 @@ document.addEventListener("DOMContentLoaded", async function() {
                     browser.storage.local.set({
                         calendars: calendarsRaw
                     });
-                    console.log("Kalender heruntergeladen: " + calendarsRaw);
-                });
-                // Kalenderdaten aus dem Speicher abrufen, in jeweilige Arrays filtern und wieder speichern
-                browser.storage.local.get(["calendars"]).then(result => {
-        
+
+                    // Kalenderdaten in jeweilige Arrays filtern und wieder speichern                    
                     // Filtern und Extrahieren der Daten für Wiedervorlagen
-                    const followUpCalendars = result.calendars
+                    const followUpCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'FOLLOWUP')
                         .map(calendar => ({ id: calendar.id, displayName: calendar.displayName }));
                         console.log(followUpCalendars);
                         browser.storage.local.set({ followUpCalendars });
             
                     // Filtern und Extrahieren der Daten für Fristen
-                    const respiteCalendars = result.calendars
+                    const respiteCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'RESPITE')
                         .map(calendar => ({ id: calendar.id, displayName: calendar.displayName }));
                         console.log(respiteCalendars);
-                        browser.storage.local.set({ respiteCalendars });
-                        
+                        browser.storage.local.set({ respiteCalendars });                        
             
                     // Filtern und Extrahieren der Daten für Termine
-                    const eventCalendars = result.calendars
+                    const eventCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'EVENT')
                         .map(calendar => ({ id: calendar.id, displayName: calendar.displayName }));
                         console.log(eventCalendars);
                         browser.storage.local.set({ eventCalendars });
+                    console.log("Kalender heruntergeladen: " + calendarsRaw);                      
                         
                 });
                 getUsers(result.username, result.password, result.serverAddress).then(data => {
@@ -224,7 +221,7 @@ document.getElementById("searchInput").addEventListener("input", function() {
     if (query) {
         searchCases(query);
     } else {
-        document.getElementById("resultsList").innerHTML = "";
+        document.getElementById("resultsList").textContent = "";
     }
 });
 
diff --git a/popup_menu_bundle_save.js b/popup_menu_bundle_save.js
index 7da306a..cb4b886 100644
--- a/popup_menu_bundle_save.js
+++ b/popup_menu_bundle_save.js
@@ -105,33 +105,31 @@ document.addEventListener("DOMContentLoaded", async function () {
                     browser.storage.local.set({
                         calendars: calendarsRaw
                     });
-                    console.log("Kalender heruntergeladen: " + calendarsRaw);
-                });
-                // Kalenderdaten aus dem Speicher abrufen, in jeweilige Arrays filtern und wieder speichern
-                browser.storage.local.get(["calendars"]).then(result => {
-        
+
+                    // Kalenderdaten in jeweilige Arrays filtern und wieder speichern        
                     // Filtern und Extrahieren der Daten für Wiedervorlagen
-                    const followUpCalendars = result.calendars
+                    const followUpCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'FOLLOWUP')
                         .map(calendar => ({ id: calendar.id, displayName: calendar.displayName }));
                         console.log(followUpCalendars);
                         browser.storage.local.set({ followUpCalendars });
             
                     // Filtern und Extrahieren der Daten für Fristen
-                    const respiteCalendars = result.calendars
+                    const respiteCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'RESPITE')
                         .map(calendar => ({ id: calendar.id, displayName: calendar.displayName }));
                         console.log(respiteCalendars);
-                        browser.storage.local.set({ respiteCalendars });
-                        
+                        browser.storage.local.set({ respiteCalendars });                        
             
                     // Filtern und Extrahieren der Daten für Termine
-                    const eventCalendars = result.calendars
+                    const eventCalendars = calendarsRaw
                         .filter(calendar => calendar.eventType === 'EVENT')
                         .map(calendar => ({ id: calendar.id, displayName: calendar.displayName }));
                         console.log(eventCalendars);
                         browser.storage.local.set({ eventCalendars });
-                        
+                    
+                    console.log("Kalender heruntergeladen: " + calendarsRaw);
+                
                 });
                 getUsers(result.username, result.password, result.serverAddress).then(data => {
                     const users = data.map(item => item.displayName);
@@ -257,12 +255,12 @@ async function getTags(username, password, serverAddress) {
 
 
 // Event-Listener für die Suche
-document.getElementById("searchInput").addEventListener("input", function () {
+document.getElementById("searchInput").addEventListener("input", function() {
     const query = this.value.trim();
     if (query) {
         searchCases(query);
     } else {
-        document.getElementById("resultsList").innerHTML = "";
+        document.getElementById("resultsList").textContent = "";
     }
 });