diff --git a/templates/layouts/partials/helpers/search.jet.html b/templates/layouts/partials/helpers/search.jet.html
index 95055c86..6af08115 100644
--- a/templates/layouts/partials/helpers/search.jet.html
+++ b/templates/layouts/partials/helpers/search.jet.html
@@ -47,7 +47,7 @@
         <input type="hidden" name="max" value="{{Navigation.MaxItemPerPage}}"/>
         <input type="hidden" name="userID" value="{{Search.UserID}}"/>
         <input type="hidden" name="q" value="{{Search.NameLike}}"/>
-    <span style="margin-top: 10px;" class="form-refine">{{ T("between")}} <input class="form-input" size="7" name="minSize" type="text" value="{{Search.MinSize}}"> {{ T("and")}} <input size="7" class="form-input" name="maxSize" type="text" value="{{Search.MaxSize}}"> 
+    <span style="margin-top: 10px;" class="form-refine">{{ T("between")}} <input class="form-input" size="7" name="minSize" type="text" value="{{Search.MinSize}}"> {{ T("and")}} <input size="7" class="form-input" name="maxSize" type="text" value="{{Search.MaxSize}}">
     <select name="sizeType" class="form-input">
         <option value="b"{{if Search.SizeType == "b"}} selected{{end}}>B</option>
         <option value="k"{{if Search.SizeType == "k"}} selected{{end}}>KiB</option>
@@ -56,7 +56,7 @@
     </select>
      {{  T("large")}}
     </span>
-    <span class="form-refine">{{ T("between")}} <input class="form-input" size="7" name="fromDate" type="text" value="{{Search.FromDate}}"> {{ T("and")}} <input class="form-input" size="7" name="toDate" type="text" value="{{Search.ToDate}}"> 
+    <span class="form-refine">{{ T("between")}} <input class="form-input" size="7" name="fromDate" type="text" value="{{Search.FromDate}}"> {{ T("and")}} <input class="form-input" size="7" name="toDate" type="text" value="{{Search.ToDate}}">
     <select name="dateType" class="form-input">
         <option value="d"{{if Search.DateType == "d"}} selected{{end}}>{{  T("days")}}</option>
         <option value="m"{{if Search.DateType == "m"}} selected{{end}}>{{  T("months")}}</option>
@@ -66,8 +66,8 @@
     </span>
     <div name="language" class="form-refine form-input language">
 	{{ range _, language := GetTorrentLanguages() }}
-		<input type="checkbox" name="lang" id="lang-{{ language }}" value="{{language}}">
-		<label for="lang-{{ language }}" class="flag flag-{{ language }}" title="{{LanguageName(language, T)}}"></label>
+		<input type="checkbox" name="lang" id="lang-{{ FlagCode(language) }}" value="{{FlagCode(language)}}">
+		<label for="lang-{{ FlagCode(language) }}" class="flag flag-{{ FlagCode(language) }}" title="{{LanguageName(language, T)}}"></label>
 	{{ end }}
     </div>
     <button type="submit" class="form-input refine-btn">{{  T("refine")}}</button>