diff --git a/public/css/main.css b/public/css/main.css
index 67942f10..4e39256a 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -264,19 +264,17 @@ th, .home-td {
 	position: relative;
 	text-align: left;
 }
-.tr-cat a { 
+.tr-cat a.category { 
 	width: 100%;
 	height: 100%;
 	display: block; 
 }
-.tr-cat img {
-	margin-top: 2px;
-}
+.tr-cat img { margin-top: 2px; }
 .tr-cat .nyaa-cat img {
 	position: absolute;
-    bottom: -2px;
-    display: block;
-    left: 11px;
+	bottom: -2px;
+	display: block;
+	left: 11px;
 }
 
 
diff --git a/templates/layouts/partials/helpers/search.jet.html b/templates/layouts/partials/helpers/search.jet.html
index 347658ea..95055c86 100644
--- a/templates/layouts/partials/helpers/search.jet.html
+++ b/templates/layouts/partials/helpers/search.jet.html
@@ -64,6 +64,12 @@
     </select>
      {{ T("old")}}.
     </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>
+	{{ end }}
+    </div>
     <button type="submit" class="form-input refine-btn">{{  T("refine")}}</button>
     </form>
     </details>
diff --git a/templates/site/torrents/listing.jet.html b/templates/site/torrents/listing.jet.html
index 3addb7e2..15cfd84c 100644
--- a/templates/site/torrents/listing.jet.html
+++ b/templates/site/torrents/listing.jet.html
@@ -53,10 +53,12 @@
 			  {{ else}}
               <div class="nyaa-cat nyaa-cat-{{ .SubCategory}}">
 			  {{end}}
-                  <a href="{{ URL.Parse("/search?c="+.Category+"_"+ .SubCategory) }}" title="{{ T(CategoryName(.Category, .SubCategory)) }}">
-              {{if len(.Languages) == 1 && .Languages[0] != "" }}
-                  <img src="img/blank.gif" alt="{{ LanguageName(.Languages[0], T) }}" class="flag flag-{{FlagCode(.Languages[0])}}" title="{{ LanguageName(.Languages[0], T) }}">
-              {{end}}
+                  <a href="{{ URL.Parse("/search?c="+.Category+"_"+ .SubCategory) }}" title="{{ T(CategoryName(.Category, .SubCategory)) }}" class="category">
+              {{if .Languages[0] != "" }}
+                  	<a href="{{ URL.Parse("/search?c="+.Category+"_"+ .SubCategory +"&lang=" + FlagCode(.languages[0])) }}">
+				<img src="img/blank.gif" alt="{{ LanguageName(.Languages[0], T) }}" class="flag flag-{{ (len(.Languages) == 1) ?  FlagCode(.Languages[0]) : "multiple" }}" title=" {{ range key, language := .Languages }}{{ LanguageName(language, T) }}{{ if len(.Languages) > 1 && (key+1) < len(.Languages) }},{{ end }}{{ end }}">
+			</a>
+	      {{end}}
                   </a>
               </div>
               </td>