diff --git a/front/js/settings_utils.js b/front/js/settings_utils.js
index d520182f..a810e41f 100755
--- a/front/js/settings_utils.js
+++ b/front/js/settings_utils.js
@@ -609,7 +609,6 @@ function reverseTransformers(val, transformers) {
         break;
       case "base64":
         // Implement base64 decoding logic
-        console.log("💌");
         if (isBase64(val)) {
           val = atob(val);
         }
@@ -801,7 +800,7 @@ function genListWithInputSet(options, valuesArray, targetField, transformers, pl
     if(labelName != '❌None')
     {
       labelName = reverseTransformers(labelName, transformers)
-      console.log(transformers);
+      // console.log(transformers);
     }
 
     listHtml += `<li ${selected}>
diff --git a/front/php/templates/header.php b/front/php/templates/header.php
index 34e3f4a1..c1b8647b 100755
--- a/front/php/templates/header.php
+++ b/front/php/templates/header.php
@@ -416,7 +416,7 @@ if ($ENABLED_DARKMODE === True) {
 // Generate work-in-progress icons
 function workInProgress() {
 
-  if($(".work-in-progress").html().trim() == "")
+  if($(".work-in-progress").length > 0 && $(".work-in-progress").html().trim() == "")
   {
     $(".work-in-progress").append(`
               <a href="https://github.com/jokob-sk/NetAlertX/issues" target="_blank">
diff --git a/front/php/templates/language/lang.php b/front/php/templates/language/lang.php
index 69246e5b..3421bda7 100755
--- a/front/php/templates/language/lang.php
+++ b/front/php/templates/language/lang.php
@@ -103,7 +103,8 @@ function lang($key)
         }
     }
 
-    return $result;
+    // HTML encode the result before returning
+    return str_replace("'", '&#39;', $result);
 }