diff --git a/modules/config.xqm b/modules/config.xqm
index b28884c4..c938a069 100644
--- a/modules/config.xqm
+++ b/modules/config.xqm
@@ -139,9 +139,10 @@ declare variable $config:facets := [
     map {
         "dimension": "language",
         "heading": "facets.language",
-        "max": 10,
+        "source": "api/search/facets/language",
+        "max": 5,
         "hierarchical": false(),
-        "output": function($label) {
+        "output": function($label, $language) {
             switch($label)
                 case "de" return "German"
                 case "es" return "Spanish"
@@ -157,7 +158,7 @@ declare variable $config:facets := [
         "dimension": "feature",
         "heading": "facets.feature",
         "source": "api/search/facets/feature",
-        "max": 15,
+        "max": 5,
         "hierarchical": false()
     },
     map {
diff --git a/modules/facets.xql b/modules/facets.xql
index 79cd5815..5f21d43c 100644
--- a/modules/facets.xql
+++ b/modules/facets.xql
@@ -38,6 +38,7 @@ declare function facets:sort($facets as map(*)?) {
 
 declare function facets:print-table($config as map(*), $nodes as element()+, $values as xs:string*, $params as xs:string*) {
     let $all := exists($config?max) and facets:get-parameter("all-" || $config?dimension)
+    let $lang := tokenize(facets:get-parameter("language"), '-')[1]
     let $count := if ($all) then 50 else $config?max
     let $facets :=
         if (exists($values)) then
@@ -50,11 +51,7 @@ declare function facets:print-table($config as map(*), $nodes as element()+, $va
             {
                 array:for-each(facets:sort($facets), function($entry) {
                     map:for-each($entry, function($label, $freq) {
-                        let $content :=
-                            if (exists($config?output)) then
-                                $config?output($label)
-                            else
-                                $label
+                        let $content := facets:translate($config, $lang, $label)
                         return
                         <tr>
                             <td>
@@ -88,6 +85,7 @@ declare function facets:print-table($config as map(*), $nodes as element()+, $va
 
 declare function facets:display($config as map(*), $nodes as element()+) {
     let $params := facets:get-parameter("facet-" || $config?dimension)
+    let $lang := tokenize(facets:get-parameter("language"), '-')[1]
     let $table := facets:print-table($config, $nodes, (), $params)
 
     let $maxcount := 50
@@ -127,11 +125,7 @@ declare function facets:display($config as map(*), $nodes as element()+) {
                         <select multiple="">
                         {
                             for $param in facets:get-parameter("facet-" || $config?dimension)
-                            let $label :=
-                                if (map:contains($config, "output")) then
-                                    $config?output($param)
-                                else
-                                    $param
+                            let $label := facets:translate($config, $lang, $param)
                             return
                                 <option value="{$param}" data-i18n="{$label}" selected="">{$label}</option>
                         }
@@ -156,4 +150,16 @@ declare function facets:get-parameter($name as xs:string) {
                     $fromSession?($name)
                 else
                     ()
+};
+
+declare function facets:translate($config as map(*)?, $language as xs:string?, $label as xs:string) {
+    if (exists($config) and map:contains($config, "output")) then
+        let $fn := $config?output
+        return
+            if (function-arity($fn) = 2) then
+                $fn($label, $language)
+            else
+                $fn($label)
+    else
+        $label
 };
\ No newline at end of file
diff --git a/modules/lib/api/search.xql b/modules/lib/api/search.xql
index 93c94a62..c9ba4104 100644
--- a/modules/lib/api/search.xql
+++ b/modules/lib/api/search.xql
@@ -125,19 +125,20 @@ declare function sapi:facets($request as map(*)) {
 };
 
 declare function sapi:list-facets($request as map(*)) {
-    let $value := $request?parameters?value
-    let $query := $request?parameters?query
     let $type := $request?parameters?type
     let $lang := tokenize($request?parameters?language, '-')[1]
-
+    let $facetConfig := filter($config:facets?*, function($facetCfg) {
+        $facetCfg?dimension = $type
+    })
     let $hits := session:get-attribute($config:session-prefix || ".hits")
     let $facets := ft:facets($hits, $type, ())
     
     let $matches := 
         for $key in if (exists($request?parameters?value)) then $request?parameters?value else map:keys($facets)
+        let $label := facets:translate($facetConfig, $lang, $key)
         return 
             map {
-                "text": $key,
+                "text": $label,
                 "freq": $facets($key),
                 "value": $key
             }