diff --git a/src/components/fields/CustomDataTypeLink.svelte b/src/components/fields/CustomDataTypeLink.svelte
index 8a1f498..5f44a04 100644
--- a/src/components/fields/CustomDataTypeLink.svelte
+++ b/src/components/fields/CustomDataTypeLink.svelte
@@ -1,4 +1,6 @@
 <script>
+  import { bestLanguage } from "../../lib/l10n";
+  import { dataLanguagesStore } from "../../lib/stores";
   import { fieldData } from "../../lib/easydbHelpers";
 
   import { A } from "flowbite-svelte";
@@ -10,4 +12,4 @@
   const fdata = fieldData(data, table, field);
 </script>
 
-<A href={fdata.url}>{fdata.url}</A>
\ No newline at end of file
+<A href={fdata.url}>{bestLanguage(fdata.text, $dataLanguagesStore)}</A>
\ No newline at end of file
diff --git a/src/lib/l10n.js b/src/lib/l10n.js
index 5be0d03..60e64fd 100644
--- a/src/lib/l10n.js
+++ b/src/lib/l10n.js
@@ -3,14 +3,17 @@ const language_priority = ["de-DE", "en-US"];
 // Select the best language from the given data
 export function bestLanguage(data, lang) {
   // If the selected language exists, we take it
-  if (lang in data) {
-    return data[lang];
+  for (let l of lang) {
+    if ((l in data) && (data[l] !== "")) {
+      return data[l];
+    }
   }
 
   // Otherwise we select the language with the highest priority
-  for (let l in language_priority) {
-    if (l in data)
+  for (let l of language_priority) {
+    if ((l in data) && (data[l] !== "")) {
       return data[l];
+    }
   }
 
   // Finally, we select any language that we can find