diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java
index 06bf01df7db..b19a3e357af 100644
--- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java
+++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiSelectTextFeatureEditor.java
@@ -39,7 +39,6 @@
 import org.wicketstuff.kendo.ui.renderer.ChoiceRenderer;
 
 import de.tudarmstadt.ukp.clarin.webanno.model.ReorderableTag;
-import de.tudarmstadt.ukp.clarin.webanno.model.TagSet;
 import de.tudarmstadt.ukp.inception.annotation.feature.misc.ConstraintsInUseIndicator;
 import de.tudarmstadt.ukp.inception.annotation.feature.string.KendoChoiceDescriptionScriptReference;
 import de.tudarmstadt.ukp.inception.annotation.feature.string.StringFeatureSupportProperties;
@@ -228,11 +227,11 @@ public FormComponent getFocusComponent()
     private List<ReorderableTag> getChoices(final IModel<FeatureState> aFeatureStateModel,
             String aInput)
     {
-        String input = aInput != null ? aInput.trim() : "";
+        var input = aInput != null ? aInput.trim() : "";
 
-        FeatureState featureState = aFeatureStateModel.getObject();
-        TagSet tagset = featureState.getFeature().getTagset();
-        List<ReorderableTag> choices = new ArrayList<>();
+        var featureState = aFeatureStateModel.getObject();
+        var tagset = featureState.getFeature().getTagset();
+        var choices = new ArrayList<ReorderableTag>();
 
         Collection<String> values;
         if (featureState.getValue() instanceof Collection) {
@@ -254,7 +253,7 @@ private List<ReorderableTag> getChoices(final IModel<FeatureState> aFeatureState
 
         // If the currently selected values contain any values not covered by the tagset,
         // add virtual entries for them as well
-        for (String value : values) {
+        for (var value : values) {
             if (!choices.stream().anyMatch(t -> t.getName().equals(value))) {
                 choices.add(new ReorderableTag(value, false));
             }
@@ -262,29 +261,28 @@ private List<ReorderableTag> getChoices(final IModel<FeatureState> aFeatureState
 
         if (!input.isEmpty()) {
             // Move any entries that match the input case-insensitive to the top
-            List<ReorderableTag> inputMatchesInsensitive = choices.stream() //
+            var inputMatchesInsensitive = choices.stream() //
                     .filter(t -> t.getName().equalsIgnoreCase(input)) //
                     .collect(toList());
-            for (ReorderableTag t : inputMatchesInsensitive) {
+            for (var t : inputMatchesInsensitive) {
                 choices.remove(t);
                 choices.add(0, t);
             }
 
             // Move any entries that match the input case-sensitive to the top
-            List<ReorderableTag> inputMatchesSensitive = choices.stream() //
+            var inputMatchesSensitive = choices.stream() //
                     .filter(t -> t.getName().equals(input)) //
                     .collect(toList());
             if (inputMatchesSensitive.isEmpty()) {
                 // If the input does not match any tagset entry, add a new virtual entry for
-                // the
-                // input so that we can select that and add it - this has no description.
+                // the input so that we can select that and add it - this has no description.
                 // If the input matches an existing entry, move it to the top.
                 if (tagset == null || tagset.isCreateTag()) {
                     choices.add(0, new ReorderableTag(input, false));
                 }
             }
             else {
-                for (ReorderableTag t : inputMatchesSensitive) {
+                for (var t : inputMatchesSensitive) {
                     choices.remove(t);
                     choices.add(0, t);
                 }
diff --git a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java
index bb18f104132..7363e7c64ca 100644
--- a/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java
+++ b/inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureTraitsEditor.java
@@ -58,8 +58,7 @@ public MultiValueStringFeatureTraitsEditor(String aId,
 
         traits = CompoundPropertyModel.of(getFeatureSupport().readTraits(feature.getObject()));
 
-        Form<MultiValueStringFeatureTraits> form = new Form<MultiValueStringFeatureTraits>(MID_FORM,
-                traits)
+        var form = new Form<MultiValueStringFeatureTraits>(MID_FORM, traits)
         {
             private static final long serialVersionUID = -3109239605783291123L;
 
@@ -74,7 +73,7 @@ protected void onSubmit()
         form.setOutputMarkupPlaceholderTag(true);
         add(form);
 
-        DropDownChoice<TagSet> tagset = new DropDownChoice<>("tagset");
+        var tagset = new DropDownChoice<TagSet>("tagset");
         tagset.setOutputMarkupPlaceholderTag(true);
         tagset.setChoiceRenderer(new ChoiceRenderer<>("name"));
         tagset.setNullValid(true);
diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/ExportedKnowledgeBase.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/ExportedKnowledgeBase.java
index 6535674f2e6..622666b2406 100644
--- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/ExportedKnowledgeBase.java
+++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/ExportedKnowledgeBase.java
@@ -90,6 +90,9 @@ public class ExportedKnowledgeBase
     @JsonProperty("additional_matching_properties")
     private List<String> additionalMatchingProperties;
 
+    @JsonProperty("additional_languages")
+    private List<String> additionalLanguages;
+
     @JsonProperty("default_language")
     private String defaultLanguage;
 
@@ -314,6 +317,16 @@ public List<String> getAdditionalMatchingProperties()
         return additionalMatchingProperties;
     }
 
+    public void setAdditionalLanguages(List<String> aAdditionalLanguages)
+    {
+        additionalLanguages = aAdditionalLanguages;
+    }
+
+    public List<String> getAdditionalLanguages()
+    {
+        return additionalLanguages;
+    }
+
     public String getDefaultLanguage()
     {
         return defaultLanguage;
diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java
index 28a0fab6863..c133535b5ce 100644
--- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java
+++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/exporter/KnowledgeBaseExporter.java
@@ -132,6 +132,7 @@ public void exportData(FullProjectExportRequest aRequest, ProjectExportTaskMonit
             exportedKB.setRootConcepts(new ArrayList<>(kb.getRootConcepts()));
             exportedKB.setAdditionalMatchingProperties(
                     new ArrayList<>(kb.getAdditionalMatchingProperties()));
+            exportedKB.setAdditionalLanguages(new ArrayList<>(kb.getAdditionalLanguages()));
             exportedKB.setDefaultLanguage(kb.getDefaultLanguage());
             exportedKB.setDefaultDatasetIri(
                     kb.getDefaultDatasetIri() != null ? kb.getDefaultDatasetIri() : null);
@@ -242,6 +243,13 @@ public void importData(ProjectImportRequest aRequest, Project aProject,
                 kb.setAdditionalMatchingProperties(new ArrayList<>());
             }
 
+            if (exportedKB.getAdditionalLanguages() != null) {
+                kb.setAdditionalLanguages(exportedKB.getAdditionalLanguages());
+            }
+            else {
+                kb.setAdditionalLanguages(new ArrayList<>());
+            }
+
             kb.setDefaultLanguage(exportedKB.getDefaultLanguage());
             kb.setDefaultDatasetIri(
                     exportedKB.getDefaultDatasetIri() != null ? exportedKB.getDefaultDatasetIri() //
diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/model/KnowledgeBase.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/model/KnowledgeBase.java
index f42722d5958..d853ee1b02e 100644
--- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/model/KnowledgeBase.java
+++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/model/KnowledgeBase.java
@@ -203,6 +203,11 @@ public class KnowledgeBase
     @Column
     private String defaultLanguage;
 
+    @ElementCollection(fetch = FetchType.EAGER)
+    @CollectionTable(name = "knowledgebase_add_languages")
+    @Column(name = "name")
+    private Set<String> additionalLanguages = new LinkedHashSet<>();
+
     /**
      * Limits the number of results that can be retrieved from a SPARQL query.
      */
@@ -223,9 +228,9 @@ public String getRepositoryId()
         return repositoryId;
     }
 
-    public void setRepositoryId(String repositoryId)
+    public void setRepositoryId(String aRepositoryId)
     {
-        this.repositoryId = repositoryId;
+        repositoryId = aRepositoryId;
     }
 
     public Project getProject()
@@ -233,9 +238,9 @@ public Project getProject()
         return project;
     }
 
-    public void setProject(Project project)
+    public void setProject(Project aProject)
     {
-        this.project = project;
+        project = aProject;
     }
 
     public String getName()
@@ -243,9 +248,9 @@ public String getName()
         return name;
     }
 
-    public void setName(String name)
+    public void setName(String aName)
     {
-        this.name = name;
+        name = aName;
     }
 
     public RepositoryType getType()
@@ -253,9 +258,9 @@ public RepositoryType getType()
         return type;
     }
 
-    public void setType(RepositoryType type)
+    public void setType(RepositoryType aType)
     {
-        this.type = type;
+        type = aType;
     }
 
     public String getClassIri()
@@ -487,6 +492,16 @@ public void applyAdditionalMatchingProperties(KnowledgeBaseProfile aProfile)
         }
     }
 
+    public void applyAdditionalLanguages(KnowledgeBaseProfile aProfile)
+    {
+        if (aProfile.getAdditionalLanguages() == null) {
+            additionalLanguages = emptySet();
+        }
+        else {
+            additionalLanguages = new LinkedHashSet<>(aProfile.getAdditionalLanguages());
+        }
+    }
+
     public String getDefaultDatasetIri()
     {
         return defaultDatasetIri;
@@ -517,6 +532,19 @@ public Set<String> getAdditionalMatchingProperties()
         return additionalMatchingProperties;
     }
 
+    public void setAdditionalLanguages(Collection<String> aAdditionalLanguages)
+    {
+        additionalLanguages = new LinkedHashSet<>();
+        if (aAdditionalLanguages != null) {
+            additionalLanguages.addAll(aAdditionalLanguages);
+        }
+    }
+
+    public Set<String> getAdditionalLanguages()
+    {
+        return additionalLanguages;
+    }
+
     public boolean isUseFuzzy()
     {
         return useFuzzy;
diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java
index 8450dc32f05..421bf5f1269 100644
--- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java
+++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java
@@ -208,9 +208,7 @@ protected Iri getLabelProperty(KnowledgeBase aKb)
         protected String getLabelPropertyAsString(KnowledgeBase aKb)
         {
             switch (this) {
-            case ITEM: // fall-through
-            case CLASS: // fall-through
-            case INSTANCE:
+            case ITEM, CLASS, INSTANCE:
                 return aKb.getLabelIri();
             case PROPERTY:
                 return aKb.getPropertyLabelIri();
@@ -222,9 +220,7 @@ protected String getLabelPropertyAsString(KnowledgeBase aKb)
         protected Iri getDescriptionProperty(KnowledgeBase aKb)
         {
             switch (this) {
-            case ITEM: // fall-through
-            case CLASS: // fall-through
-            case INSTANCE:
+            case ITEM, CLASS, INSTANCE:
                 return iri(aKb.getDescriptionIri());
             case PROPERTY:
                 return iri(aKb.getPropertyDescriptionIri());
@@ -236,9 +232,7 @@ protected Iri getDescriptionProperty(KnowledgeBase aKb)
         protected List<Iri> getAdditionalMatchingProperties(KnowledgeBase aKb)
         {
             switch (this) {
-            case ITEM: // fall-through
-            case CLASS: // fall-through
-            case INSTANCE:
+            case ITEM, CLASS, INSTANCE:
                 return aKb.getAdditionalMatchingProperties().stream() //
                         .map(Rdf::iri) //
                         .collect(toList());
@@ -302,9 +296,7 @@ protected GraphPattern ancestorsPattern(KnowledgeBase aKB, Iri aContext)
             var subPropertyProperty = iri(aKB.getSubPropertyIri());
 
             switch (this) {
-            case ITEM:
-            case CLASS:
-            case INSTANCE: {
+            case ITEM, CLASS, INSTANCE: {
                 var classPatterns = new ArrayList<GraphPattern>();
                 classPatterns.add(aContext.has(
                         PropertyPathBuilder.of(subClassProperty).oneOrMore().build(), VAR_SUBJECT));
@@ -329,13 +321,13 @@ protected GraphPattern ancestorsPattern(KnowledgeBase aKB, Iri aContext)
          */
         protected GraphPattern childrenPattern(KnowledgeBase aKB, Iri aContext)
         {
-            Iri subPropertyProperty = iri(aKB.getSubPropertyIri());
-            Iri subClassProperty = iri(aKB.getSubclassIri());
-            Iri typeOfProperty = iri(aKB.getTypeIri());
+            var subPropertyProperty = iri(aKB.getSubPropertyIri());
+            var subClassProperty = iri(aKB.getSubclassIri());
+            var typeOfProperty = iri(aKB.getTypeIri());
 
             switch (this) {
             case ITEM: {
-                List<GraphPattern> classPatterns = new ArrayList<>();
+                var classPatterns = new ArrayList<GraphPattern>();
                 classPatterns
                         .add(VAR_SUBJECT.has(() -> subClassProperty.getQueryString(), aContext));
                 classPatterns.add(VAR_SUBJECT.has(typeOfProperty, aContext));
@@ -351,7 +343,7 @@ protected GraphPattern childrenPattern(KnowledgeBase aKB, Iri aContext)
             case CLASS: {
                 // Follow the subclass property and also take into account owl:intersectionOf if
                 // using OWL classes
-                List<GraphPattern> classPatterns = new ArrayList<>();
+                var classPatterns = new ArrayList<GraphPattern>();
                 classPatterns.add(VAR_SUBJECT.has(subClassProperty, aContext));
                 if (OWL.CLASS.stringValue().equals(aKB.getClassIri())) {
                     classPatterns.add(VAR_SUBJECT.has(OWL_INTERSECTIONOF_PATH, aContext));
@@ -371,13 +363,13 @@ protected GraphPattern childrenPattern(KnowledgeBase aKB, Iri aContext)
          */
         protected GraphPattern parentsPattern(KnowledgeBase aKB, Iri aContext)
         {
-            Iri subClassProperty = iri(aKB.getSubclassIri());
-            Iri subPropertyProperty = iri(aKB.getSubPropertyIri());
-            Iri typeOfProperty = iri(aKB.getTypeIri());
+            var subClassProperty = iri(aKB.getSubclassIri());
+            var subPropertyProperty = iri(aKB.getSubPropertyIri());
+            var typeOfProperty = iri(aKB.getTypeIri());
 
             switch (this) {
             case CLASS: {
-                List<GraphPattern> classPatterns = new ArrayList<>();
+                var classPatterns = new ArrayList<GraphPattern>();
                 classPatterns.add(aContext.has(subClassProperty, VAR_SUBJECT));
                 classPatterns.add(aContext.has(typeOfProperty, VAR_SUBJECT));
                 if (OWL.CLASS.stringValue().equals(aKB.getClassIri())) {
@@ -443,10 +435,7 @@ protected GraphPattern rootsPattern(KnowledgeBase aKb)
         protected Iri getDeprecationProperty(KnowledgeBase aKb)
         {
             switch (this) {
-            case ITEM: // fall-through
-            case CLASS: // fall-through
-            case INSTANCE: // fall-through
-            case PROPERTY:
+            case ITEM, CLASS, INSTANCE, PROPERTY:
                 return iri(aKb.getDeprecationPropertyIri());
             default:
                 throw new IllegalStateException("Unsupported mode: " + this);
@@ -479,7 +468,7 @@ public static SPARQLQueryPrimaryConditions forItems(KnowledgeBase aKB)
      */
     public static SPARQLQueryPrimaryConditions forClasses(KnowledgeBase aKB)
     {
-        SPARQLQueryBuilder builder = new SPARQLQueryBuilder(aKB, Mode.CLASS);
+        var builder = new SPARQLQueryBuilder(aKB, Mode.CLASS);
         builder.limitToClasses();
         return builder;
     }
@@ -494,7 +483,7 @@ public static SPARQLQueryPrimaryConditions forClasses(KnowledgeBase aKB)
      */
     public static SPARQLQueryPrimaryConditions forInstances(KnowledgeBase aKB)
     {
-        SPARQLQueryBuilder builder = new SPARQLQueryBuilder(aKB, Mode.INSTANCE);
+        var builder = new SPARQLQueryBuilder(aKB, Mode.INSTANCE);
         builder.limitToInstances();
         return builder;
     }
@@ -509,7 +498,7 @@ public static SPARQLQueryPrimaryConditions forInstances(KnowledgeBase aKB)
      */
     public static SPARQLQueryPrimaryConditions forProperties(KnowledgeBase aKB)
     {
-        SPARQLQueryBuilder builder = new SPARQLQueryBuilder(aKB, Mode.PROPERTY);
+        var builder = new SPARQLQueryBuilder(aKB, Mode.PROPERTY);
         builder.limitToProperties();
         return builder;
     }
@@ -529,7 +518,9 @@ public static SPARQLQueryPrimaryConditions forProperties(KnowledgeBase aKB)
         var appCtx = ApplicationContextProvider.getApplicationContext();
         if (appCtx != null) {
             var props = appCtx.getBean(KnowledgeBaseProperties.class);
-            withFallbackLanguages(props.getDefaultFallbackLanguages());
+            var langs = new LinkedHashSet<>(props.getDefaultFallbackLanguages());
+            langs.addAll(aKB.getAdditionalLanguages());
+            withFallbackLanguages(langs);
         }
     }
 
@@ -1144,12 +1135,12 @@ private void limitToProperties()
 
     private GraphPattern isPropertyPattern()
     {
-        Iri propertyIri = iri(kb.getPropertyTypeIri());
-        Iri subPropertyProperty = iri(kb.getSubPropertyIri());
-        Iri typeOfProperty = iri(kb.getTypeIri());
-        Iri pSubClass = iri(kb.getSubclassIri());
+        var propertyIri = iri(kb.getPropertyTypeIri());
+        var subPropertyProperty = iri(kb.getSubPropertyIri());
+        var typeOfProperty = iri(kb.getTypeIri());
+        var pSubClass = iri(kb.getSubclassIri());
 
-        List<GraphPattern> propertyPatterns = new ArrayList<>();
+        var propertyPatterns = new ArrayList<GraphPattern>();
 
         // An item is a property if ...
         // ... it is explicitly defined as being a property
@@ -1296,15 +1287,14 @@ public SelectQuery selectQuery()
     @Override
     public List<KBHandle> asHandles(RepositoryConnection aConnection, boolean aAll)
     {
-        long startTime = currentTimeMillis();
-        String queryId = toHexString(hashCode());
+        var startTime = currentTimeMillis();
+        var queryId = toHexString(hashCode());
 
-        String queryString = selectQuery().getQueryString();
+        var queryString = selectQuery().getQueryString();
         // queryString = QueryParserUtil.parseQuery(QueryLanguage.SPARQL, queryString, null)
         // .toString();
         LOG.trace("[{}] Query: {}", queryId, queryString);
 
-        List<KBHandle> results;
         if (returnEmptyResult) {
             LOG.debug("[{}] Query was skipped because it would not return any results anyway",
                     queryId);
@@ -1313,12 +1303,12 @@ public List<KBHandle> asHandles(RepositoryConnection aConnection, boolean aAll)
         }
 
         try {
-            TupleQuery tupleQuery = aConnection.prepareTupleQuery(queryString);
+            var tupleQuery = aConnection.prepareTupleQuery(queryString);
             tupleQuery.setIncludeInferred(includeInferred);
-            results = evaluateListQuery(tupleQuery, aAll);
+            var results = evaluateListQuery(tupleQuery, aAll);
             results.sort(comparing(KBObject::getUiLabel, CASE_INSENSITIVE_ORDER));
 
-            long duration = currentTimeMillis() - startTime;
+            var duration = currentTimeMillis() - startTime;
             LOG.debug("[{}] Query returned {} results in {}ms {}", queryId, results.size(),
                     duration, duration > 1000 ? "-- SLOW QUERY!" : "");
 
@@ -1348,14 +1338,14 @@ public List<KBHandle> asHandles(RepositoryConnection aConnection, boolean aAll)
     @Override
     public boolean exists(RepositoryConnection aConnection, boolean aAll)
     {
-        long startTime = currentTimeMillis();
-        String queryId = toHexString(hashCode());
+        var startTime = currentTimeMillis();
+        var queryId = toHexString(hashCode());
 
         limit(1);
 
-        SelectQuery query = selectQuery();
+        var query = selectQuery();
 
-        String queryString = query.getQueryString();
+        var queryString = query.getQueryString();
         LOG.trace("[{}] Query: {}", queryId, queryString);
 
         if (returnEmptyResult) {
@@ -1366,10 +1356,10 @@ public boolean exists(RepositoryConnection aConnection, boolean aAll)
         }
 
         try {
-            TupleQuery tupleQuery = aConnection.prepareTupleQuery(queryString);
-            boolean result = !evaluateListQuery(tupleQuery, aAll).isEmpty();
+            var tupleQuery = aConnection.prepareTupleQuery(queryString);
+            var result = !evaluateListQuery(tupleQuery, aAll).isEmpty();
 
-            long duration = currentTimeMillis() - startTime;
+            var duration = currentTimeMillis() - startTime;
             LOG.debug("[{}] Query returned {} in {}ms {}", queryId, result, duration,
                     duration > 1000 ? "-- SLOW QUERY!" : "");
 
@@ -1388,15 +1378,14 @@ public boolean exists(RepositoryConnection aConnection, boolean aAll)
     @Override
     public Optional<KBHandle> asHandle(RepositoryConnection aConnection, boolean aAll)
     {
-        long startTime = currentTimeMillis();
-        String queryId = toHexString(hashCode());
+        var startTime = currentTimeMillis();
+        var queryId = toHexString(hashCode());
 
         limit(1);
 
-        String queryString = selectQuery().getQueryString();
+        var queryString = selectQuery().getQueryString();
         LOG.trace("[{}] Query: {}", queryId, queryString);
 
-        Optional<KBHandle> result;
         if (returnEmptyResult) {
             LOG.debug("[{}] Query was skipped because it would not return any results anyway",
                     queryId);
@@ -1404,11 +1393,11 @@ public Optional<KBHandle> asHandle(RepositoryConnection aConnection, boolean aAl
         }
 
         try {
-            TupleQuery tupleQuery = aConnection.prepareTupleQuery(queryString);
+            var tupleQuery = aConnection.prepareTupleQuery(queryString);
             tupleQuery.setIncludeInferred(includeInferred);
-            result = evaluateListQuery(tupleQuery, aAll).stream().findFirst();
+            var result = evaluateListQuery(tupleQuery, aAll).stream().findFirst();
 
-            long duration = currentTimeMillis() - startTime;
+            var duration = currentTimeMillis() - startTime;
             LOG.debug("[{}] Query returned a result in {}ms {}", queryId, duration,
                     duration > 1000 ? "-- SLOW QUERY!" : "");
 
@@ -1519,8 +1508,8 @@ else if (langPrio.indexOf(current.getLanguage()) > langPrio
 
     private void extractLabel(KBHandle aTargetHandle, BindingSet aSourceBindings)
     {
-        Binding prefLabel = aSourceBindings.getBinding(VAR_PREF_LABEL_NAME);
-        Binding matchTerm = aSourceBindings.getBinding(VAR_MATCH_TERM_NAME);
+        var prefLabel = aSourceBindings.getBinding(VAR_PREF_LABEL_NAME);
+        var matchTerm = aSourceBindings.getBinding(VAR_MATCH_TERM_NAME);
 
         // Obtain name either from the pref-label or from the match term if available
         if (prefLabel != null) {
diff --git a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/yaml/KnowledgeBaseProfile.java b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/yaml/KnowledgeBaseProfile.java
index 00aa9149b98..d5cef3306a3 100644
--- a/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/yaml/KnowledgeBaseProfile.java
+++ b/inception/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/yaml/KnowledgeBaseProfile.java
@@ -63,6 +63,9 @@ public class KnowledgeBaseProfile
     @JsonProperty("additional-matching-properties")
     private List<String> additionalMatchingProperties;
 
+    @JsonProperty("additional-languages")
+    private List<String> additionalLanguages;
+
     @JsonProperty("info")
     private KnowledgeBaseInfo info;
 
@@ -177,6 +180,16 @@ public void setAdditionalMatchingProperties(List<String> aProperties)
         additionalMatchingProperties = aProperties;
     }
 
+    public List<String> getAdditionalLanguages()
+    {
+        return additionalLanguages;
+    }
+
+    public void setAdditionalLanguages(List<String> aLanguages)
+    {
+        additionalLanguages = aLanguages;
+    }
+
     public KnowledgeBaseInfo getInfo()
     {
         return info;
@@ -226,7 +239,7 @@ public static Map<String, KnowledgeBaseProfile> readKnowledgeBaseProfiles() thro
         try (var r = new InputStreamReader(
                 KnowledgeBaseProfile.class.getResourceAsStream(KNOWLEDGEBASE_PROFILES_YAML),
                 UTF_8)) {
-            ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
+            var mapper = new ObjectMapper(new YAMLFactory());
             return mapper.readValue(r, new TypeReference<HashMap<String, KnowledgeBaseProfile>>()
             {
             });
@@ -243,20 +256,25 @@ public boolean equals(Object o)
             return false;
         }
         KnowledgeBaseProfile that = (KnowledgeBaseProfile) o;
-        return Objects.equals(name, that.name) && Objects.equals(disabled, that.disabled)
-                && Objects.equals(access, that.access) && Objects.equals(mapping, that.mapping)
-                && Objects.equals(type, that.type)
-                && Objects.equals(rootConcepts, that.rootConcepts)
-                && Objects.equals(info, that.info) && Objects.equals(reification, that.reification)
-                && Objects.equals(defaultLanguage, that.defaultLanguage)
-                && Objects.equals(defaultDataset, that.defaultDataset);
+        return Objects.equals(name, that.name) //
+                && Objects.equals(disabled, that.disabled) //
+                && Objects.equals(access, that.access) //
+                && Objects.equals(mapping, that.mapping) //
+                && Objects.equals(type, that.type) //
+                && Objects.equals(rootConcepts, that.rootConcepts) //
+                && Objects.equals(info, that.info) //
+                && Objects.equals(reification, that.reification) //
+                && Objects.equals(defaultLanguage, that.defaultLanguage) //
+                && Objects.equals(defaultDataset, that.defaultDataset) //
+                && Objects.equals(additionalMatchingProperties, that.additionalMatchingProperties) //
+                && Objects.equals(additionalLanguages, that.additionalLanguages);
     }
 
     @Override
     public int hashCode()
     {
         return Objects.hash(name, disabled, type, access, mapping, rootConcepts, info, reification,
-                defaultLanguage, defaultDataset);
+                defaultLanguage, defaultDataset, additionalMatchingProperties, additionalLanguages);
     }
 
     @Override
diff --git a/inception/inception-kb/src/main/resources/de/tudarmstadt/ukp/inception/kb/model/db-changelog.xml b/inception/inception-kb/src/main/resources/de/tudarmstadt/ukp/inception/kb/model/db-changelog.xml
index 7b9c35f75f4..6d718a72bc2 100644
--- a/inception/inception-kb/src/main/resources/de/tudarmstadt/ukp/inception/kb/model/db-changelog.xml
+++ b/inception/inception-kb/src/main/resources/de/tudarmstadt/ukp/inception/kb/model/db-changelog.xml
@@ -490,4 +490,19 @@
       </column>
     </addColumn>
   </changeSet>
+
+  <changeSet author="INCEpTION Team" id="20240920-1">
+    <preConditions onFail="MARK_RAN">
+      <not>
+        <tableExists tableName="knowledgebase_add_languages"/>
+      </not>
+    </preConditions>
+    <createTable tableName="knowledgebase_add_languages">
+      <column name="knowledgebase_repositoryId" type="VARCHAR(255)">
+        <constraints nullable="false" />
+      </column>
+      <column name="name" type="VARCHAR(255)">
+      </column>
+    </createTable>
+  </changeSet>
 </databaseChangeLog>
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.html b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.html
index e82ad93be87..a7dee9e5c8c 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.html
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.html
@@ -41,6 +41,14 @@ <h5 class="col-sm-12">
       <input wicket:id="language"/>
     </div>
   </div>
+  <div class="row form-row" wicket:enclosure="additionalLanguages">
+    <label class="col-form-label col-sm-3" wicket:for="additionalLanguages">
+      <wicket:message key="kb.wizard.steps.type.additionalLanguages"/>
+    </label>
+    <div class="col-sm-9">
+      <select wicket:id="additionalLanguages"/>
+    </div>
+  </div>
   <div class="row form-row" wicket:enclosure="enabled">
     <div class="offset-sm-3 col-sm-9">
       <div class="form-check">
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java
index 3019fe79cba..134718a1581 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/GeneralSettingsPanel.java
@@ -18,9 +18,12 @@
 package de.tudarmstadt.ukp.inception.ui.kb.project;
 
 import static java.util.Arrays.asList;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.markup.html.form.RequiredTextField;
 import org.apache.wicket.markup.html.form.TextField;
@@ -31,7 +34,11 @@
 import org.apache.wicket.validation.IValidatable;
 import org.apache.wicket.validation.IValidator;
 import org.apache.wicket.validation.ValidationError;
+import org.wicketstuff.jquery.core.JQueryBehavior;
+import org.wicketstuff.jquery.core.Options;
+import org.wicketstuff.kendo.ui.KendoDataSource;
 import org.wicketstuff.kendo.ui.form.combobox.ComboBox;
+import org.wicketstuff.kendo.ui.form.multiselect.lazy.MultiSelect;
 
 import de.tudarmstadt.ukp.clarin.webanno.model.Project;
 import de.tudarmstadt.ukp.inception.kb.IriConstants;
@@ -44,9 +51,23 @@ public class GeneralSettingsPanel
 {
     private static final long serialVersionUID = 8824114174867195670L;
 
+    private static final List<String> LANGUAGE_CODES = asList("aa", "ab", "ae", "af", "ak", "am",
+            "an", "ar", "as", "av", "ay", "az", "ba", "be", "bg", "bi", "bm", "bn", "bo", "br",
+            "bs", "ca", "ce", "ch", "co", "cr", "cs", "cu", "cv", "cy", "da", "de", "dv", "dz",
+            "ee", "el", "en", "eo", "es", "et", "eu", "fa", "ff", "fi", "fj", "fo", "fr", "fy",
+            "ga", "gd", "gl", "gn", "gu", "gv", "ha", "he", "hi", "ho", "hr", "ht", "hu", "hy",
+            "hz", "ia", "id", "ie", "ig", "ii", "ik", "io", "is", "it", "iu", "ja", "jv", "ka",
+            "kg", "ki", "kj", "kk", "kl", "km", "kn", "ko", "kr", "ks", "ku", "kv", "kw", "ky",
+            "la", "lb", "lg", "li", "ln", "lo", "lt", "lu", "lv", "mg", "mh", "mi", "mk", "ml",
+            "mn", "mr", "ms", "mt", "my", "na", "nb", "nd", "ne", "ng", "nl", "nn", "no", "nr",
+            "nv", "ny", "oc", "oj", "om", "or", "os", "pa", "pi", "pl", "ps", "pt", "qu", "rm",
+            "rn", "ro", "ru", "rw", "sa", "sc", "sd", "se", "sg", "si", "sk", "sl", "sm", "sn",
+            "so", "sq", "sr", "ss", "st", "su", "sv", "sw", "ta", "te", "tg", "th", "ti", "tk",
+            "tl", "tn", "to", "tr", "ts", "tt", "tw", "ty", "ug", "uk", "ur", "uz", "ve", "vi",
+            "vo", "wa", "wo", "xh", "yi", "yo", "za", "zh", "zu");
+
     private final IModel<Project> projectModel;
     private final CompoundPropertyModel<KnowledgeBaseWrapper> kbModel;
-    private final List<String> languages = asList("en", "de");
 
     private @SpringBean KnowledgeBaseService kbService;
     private @SpringBean KnowledgeBaseProperties kbproperties;
@@ -64,6 +85,49 @@ public GeneralSettingsPanel(String id, IModel<Project> aProjectModel,
         add(languageComboBox("language", kbModel.bind("kb.defaultLanguage")));
         add(basePrefixField("basePrefix", "kb.basePrefix"));
         add(createCheckbox("enabled", "kb.enabled"));
+
+        var additionalLanguages = new MultiSelect<String>("additionalLanguages")
+        {
+            @Override
+            protected void onConfigure(KendoDataSource aDataSource)
+            {
+                // This ensures that we get the user input in getChoices
+                aDataSource.set("serverFiltering", true);
+            }
+
+            @Override
+            public void onConfigure(JQueryBehavior aBehavior)
+            {
+                super.onConfigure(aBehavior);
+                aBehavior.setOption("filter", Options.asString("contains"));
+                aBehavior.setOption("autoClose", false);
+            }
+
+            private static final long serialVersionUID = -7735027268669019571L;
+
+            @Override
+            protected List<String> getChoices(String aInput)
+            {
+                var choices = new ArrayList<>(getModelObject());
+                choices.addAll(LANGUAGE_CODES);
+                choices.sort(String::compareTo);
+                choices.remove(aInput);
+                if (isNotBlank(aInput)) {
+                    choices.add(0, aInput);
+                }
+                return choices;
+            }
+
+            @Override
+            public void convertInput()
+            {
+                var list = new ArrayList<>(asList(getInputAsArray()));
+                list.removeIf(StringUtils::isBlank);
+                this.setConvertedInput(list);
+            }
+        };
+        additionalLanguages.setModel(kbModel.bind("kb.additionalLanguages"));
+        add(additionalLanguages);
     }
 
     private TextField<String> nameField(String id, String property)
@@ -76,11 +140,11 @@ private TextField<String> nameField(String id, String property)
     private ComboBox<String> languageComboBox(String id, IModel<String> aModel)
     {
         // Only set kbModel object if it has not been initialized yet
-        if (aModel.getObject() == null && !languages.isEmpty()) {
-            aModel.setObject(languages.get(0));
+        if (aModel.getObject() == null) {
+            aModel.setObject("en");
         }
 
-        var comboBox = new ComboBox<String>(id, aModel, languages);
+        var comboBox = new ComboBox<String>(id, aModel, LANGUAGE_CODES);
         comboBox.setOutputMarkupId(true);
         comboBox.setRequired(true);
         // Do nothing just update the kbModel values
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseDetailsPanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseDetailsPanel.java
index 77a99497ed9..9031f1b7f4e 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseDetailsPanel.java
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseDetailsPanel.java
@@ -83,11 +83,11 @@ public KnowledgeBaseDetailsPanel(String aId, IModel<KnowledgeBase> aKbModel)
 
         kbModel = aKbModel;
 
-        KnowledgeBaseWrapper kbw = new KnowledgeBaseWrapper(kbModel.getObject());
+        var kbw = new KnowledgeBaseWrapper(kbModel.getObject());
 
         // set the URL of the KBW to the current SPARQL URL, if dealing with a remote repository
         if (kbw.getKb().getType() == REMOTE) {
-            RepositoryImplConfig cfg = kbService.getKnowledgeBaseConfig(kbw.getKb());
+            var cfg = kbService.getKnowledgeBaseConfig(kbw.getKb());
             if (cfg != null) {
                 String url = ((SPARQLRepositoryConfig) cfg).getQueryEndpointUrl();
                 kbw.setUrl(url);
@@ -158,7 +158,7 @@ private void actionSave(AjaxRequestTarget aTarget, Form<KnowledgeBaseWrapper> aF
 
             content.applyState();
 
-            KnowledgeBase kb = kbw.getKb();
+            var kb = kbw.getKb();
             kb.setTraits(JSONUtil.toJsonString(kbw.getTraits()));
             kbService.updateKnowledgeBase(kb, cfg);
 
@@ -192,7 +192,7 @@ private void actionReindex(AjaxRequestTarget aTarget)
     {
         aTarget.addChildren(getPage(), IFeedback.class);
 
-        KnowledgeBase kb = kbwModel.getObject().getKb();
+        var kb = kbwModel.getObject().getKb();
         try {
             LOG.info("Starting rebuilding full-text index of {} ... this may take a while ...", kb);
             kbService.rebuildFullTextIndex(kb);
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseWrapper.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseWrapper.java
index 1e2d1620113..7e0c47db12f 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseWrapper.java
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/KnowledgeBaseWrapper.java
@@ -18,12 +18,12 @@
 package de.tudarmstadt.ukp.inception.ui.kb.project;
 
 import static de.tudarmstadt.ukp.inception.support.json.JSONUtil.fromJsonString;
+import static java.util.Collections.unmodifiableList;
 
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.apache.commons.lang3.tuple.Pair;
@@ -153,7 +153,7 @@ public void putFile(String aTitle, File aFile)
 
     public List<Pair<String, File>> getFiles()
     {
-        return Collections.unmodifiableList(files);
+        return unmodifiableList(files);
     }
 
     public void clearFiles()
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.java
index 73ea6662bdf..2a88daed2cf 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.java
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.java
@@ -48,7 +48,7 @@ public ProjectKnowledgeBasePanel(String aId, final IModel<Project> aProject)
         add(detailsPanel);
 
         selectedKnowledgeBaseModel = Model.of();
-        KnowledgeBaseListPanel listPanel = new KnowledgeBaseListPanel("list", projectModel,
+        var listPanel = new KnowledgeBaseListPanel("list", projectModel,
                 selectedKnowledgeBaseModel);
         listPanel.setChangeAction(t -> {
             addOrReplace(detailsPanel);
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.properties b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.properties
index 92165d65e92..a432ead3d28 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.properties
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/ProjectKnowledgeBasePanel.properties
@@ -49,6 +49,7 @@ kb.queryLimit=Result Limit for SPARQL queries
 kb.local.fileupload.supported.list=Supported: RDF (XML/JSON/Binary), OWL (XML, Functional Syntax), OBO, JSON-LD, N-Triples, N-Quads, TriG, TriX, Turtle (optionally gzipped) 
 
 kb.wizard.steps.type.language=Language
+kb.wizard.steps.type.additionalLanguages=Additional languages
 kb.wizard.steps.type.name=Name
 kb.wizard.steps.type.type=Type
 kb.wizard.steps.schema=Schema
diff --git a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/wizard/KnowledgeBaseCreationWizard.java b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/wizard/KnowledgeBaseCreationWizard.java
index 8e94539073b..49284d6cd14 100644
--- a/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/wizard/KnowledgeBaseCreationWizard.java
+++ b/inception/inception-ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/project/wizard/KnowledgeBaseCreationWizard.java
@@ -99,7 +99,8 @@ public KnowledgeBaseCreationWizard(String id, IModel<Project> aProjectModel)
         super(id);
 
         projectModel = aProjectModel;
-        wizardDataModel = new CompoundPropertyModel<>(new KnowledgeBaseWrapper());
+        var kb = new KnowledgeBase();
+        wizardDataModel = new CompoundPropertyModel<>(new KnowledgeBaseWrapper(kb));
         wizardModel = new DynamicWizardModel(new TypeStep(null, wizardDataModel));
         wizardModel.setLastVisible(false);
         knowledgeBaseProfiles = readKbProfiles();
@@ -141,7 +142,7 @@ public TypeStep(IDynamicWizardStep previousStep,
             super(previousStep, "Create Knowledgebase", "", aKbModel);
             kbModel = aKbModel;
 
-            Component generalSettings = new GeneralSettingsPanel("generalSettings", projectModel,
+            var generalSettings = new GeneralSettingsPanel("generalSettings", projectModel,
                     aKbModel);
             add(generalSettings);
             generalSettings.get("enabled").setOutputMarkupId(true).setVisible(false);
@@ -158,7 +159,7 @@ public void applyState()
 
             switch (kbModel.getObject().getKb().getType()) {
             case LOCAL:
-                // Local KBs are writeable by default
+                // Local KBs are writable by default
                 kbModel.getObject().getKb().setReadOnly(false);
                 // local KBs are always RDF4J + Lucene, so we can set the FTS mode accordingly
                 kbModel.getObject().getKb().setFullTextSearchIri(FTS_RDF4J_LUCENE.stringValue());
@@ -255,8 +256,8 @@ public SchemaConfigurationStep(IDynamicWizardStep previousStep,
         public void applyState()
         {
             try {
-                KnowledgeBaseWrapper wrapper = wizardDataModel.getObject();
-                KnowledgeBase kb = wrapper.getKb();
+                var wrapper = wizardDataModel.getObject();
+                var kb = wrapper.getKb();
 
                 kb.setProject(projectModel.getObject());
                 kb.setTraits(JSONUtil.toJsonString(wrapper.getTraits()));
diff --git a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java
index 3fc495be05e..3e7d7bdd800 100644
--- a/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java
+++ b/inception/inception-workload-dynamic/src/main/java/de/tudarmstadt/ukp/inception/workload/dynamic/management/DynamicWorkloadManagementPage.java
@@ -519,7 +519,7 @@ public List<SourceDocument> getChoices(String aInput)
 
                 if (userSelection.getModelObject() != null) {
                     if (aInput != null) {
-                        for (SourceDocument sourceDocument : documentService
+                        for (var sourceDocument : documentService
                                 .listAnnotatableDocuments(currentProject.getObject(),
                                         userSelection.getModelObject())
                                 .keySet()) {