diff --git a/templates/files.html b/templates/files.html
index e119424..4b1b246 100755
--- a/templates/files.html
+++ b/templates/files.html
@@ -15,7 +15,7 @@
     <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
         <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
         <div class="wrapper-results">
-            <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
+            <input type="text" name="q" value="{{ .Query }}" id="search-input"/>
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="file">search</button>
             <div class="autocomplete">
                 <ul>
diff --git a/templates/forums.html b/templates/forums.html
index e833d4f..3fbdea7 100755
--- a/templates/forums.html
+++ b/templates/forums.html
@@ -15,7 +15,7 @@
     <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
         <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
         <div class="wrapper-results">
-            <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
+            <input type="text" name="q" value="{{ .Query }}" id="search-input"/>
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="forum">search</button>
             <div class="autocomplete">
                 <ul></ul>
diff --git a/templates/images.html b/templates/images.html
index ccf08ae..8f82a2b 100755
--- a/templates/images.html
+++ b/templates/images.html
@@ -15,7 +15,7 @@
     <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
         <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
         <div class="wrapper-results">
-            <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
+            <input type="text" name="q" value="{{ .Query }}" id="search-input"/>
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="image">search</button>
             <div class="autocomplete">
                 <ul>
diff --git a/templates/map.html b/templates/map.html
index 5ce8c62..d0d9fa3 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -30,7 +30,7 @@
     <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
         <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
         <div class="wrapper-results">
-            <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
+            <input type="text" name="q" value="{{ .Query }}" id="search-input"/>
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="map">search</button>
             <div class="autocomplete">
                 <ul>
diff --git a/templates/search.html b/templates/search.html
index fd68aa2..0c320ad 100755
--- a/templates/search.html
+++ b/templates/search.html
@@ -53,9 +53,17 @@
             });
 
             // Event listener for Language Selection
-            document.getElementById('languageSelect').addEventListener('change', function () {
-                updateSettings('lang', this.value);
-            });
+            if (siteLanguageSelect) {
+                siteLanguageSelect.addEventListener('change', function () {
+                    updateSettings('site_lang', this.value);
+                });
+            }
+
+            // if (searchLanguageSelect) {
+            //     searchLanguageSelect.addEventListener('change', function () {
+            //         updateSettings('search_lang', this.value);
+            //     });
+            // }
         });
     </script>     
     <div class="settings-search-div settings-search-div-search">
@@ -76,7 +84,7 @@
                 <option value="disabled" {{if eq .Safe "disabled"}}selected{{end}}>Safe Search Off</option>
                 <option value="active" {{if eq .Safe "active"}}selected{{end}}>Safe Search On</option>
             </select>
-            <select class="lang" name="lang" id="languageSelect">
+            <select class="lang" name="site_lang" id="siteLanguageSelect">
                 {{range .LanguageOptions}}
                 <option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
                 {{end}}
diff --git a/templates/settings.html b/templates/settings.html
index 59eb844..4606a53 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -40,7 +40,7 @@
                         </a>
                         <a href="/search?theme=night" class="theme-link">
                             <div class="view-image-search clickable" id="night">
-                                <img src="/static/images/night.webp" alt="night">
+                                <img src="/static/images/night.webp" alt="Night">
                                 <div class="theme-tooltip">Night</div>
                             </div>
                         </a>
@@ -64,7 +64,7 @@
                         </a>
                     </div>
                 </div>
-                
+
                 <div class="settings-row">
                     <p>Safe Search</p>
                     <select class="results-settings" name="safe" id="safeSearchSelect">
@@ -74,10 +74,19 @@
                 </div>
 
                 <div class="settings-row">
-                    <p>Preferred Language</p>
-                    <select class="results-settings" name="lang" id="languageSelect">
+                    <p>Site Language</p>
+                    <select class="results-settings" name="site_lang" id="siteLanguageSelect">
                         {{range .LanguageOptions}}
-                        <option value="{{.Code}}" {{if eq .Code $.CurrentLang}}selected{{end}}>{{.Name}}</option>
+                        <option value="{{.Code}}" {{if eq .Code $.CurrentSiteLang}}selected{{end}}>{{.Name}}</option>
+                        {{end}}
+                    </select>
+                </div>
+
+                <div class="settings-row">
+                    <p>Search Language</p>
+                    <select class="results-settings" name="search_lang" id="searchLanguageSelect">
+                        {{range .LanguageOptions}}
+                        <option value="{{.Code}}" {{if eq .Code $.CurrentSearchLang}}selected{{end}}>{{.Name}}</option>
                         {{end}}
                     </select>
                 </div>
diff --git a/templates/text.html b/templates/text.html
index 2be2d2b..3ce3d13 100755
--- a/templates/text.html
+++ b/templates/text.html
@@ -15,7 +15,7 @@
     <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
         <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
         <div class="wrapper-results">
-            <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
+            <input type="text" name="q" value="{{ .Query }}" id="search-input"/>
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="text">search</button>
             <div class="autocomplete">
                 <ul>
diff --git a/templates/videos.html b/templates/videos.html
index 3be0bc0..cca9407 100644
--- a/templates/videos.html
+++ b/templates/videos.html
@@ -15,7 +15,7 @@
     <form action="/search" id="prev-next-form" class="results-search-container" method="GET" autocomplete="off">
         <h1 class="logomobile"><a class="no-decoration" href="./">Ocásek</a></h1>
         <div class="wrapper-results">
-            <input type="text" name="q" value="{{ .Query }}" id="search-input" placeholder="Type to search..." />
+            <input type="text" name="q" value="{{ .Query }}" id="search-input"/>
             <button id="search-wrapper-ico" class="material-icons-round" name="t" value="video">search</button>
             <div class="autocomplete">
                 <ul>