diff --git a/Jenkinsfile b/Jenkinsfile
index a65c3989..5d0db790 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -112,7 +112,7 @@ pipeline {
             when {
                 allOf {
                     not { expression { params.RELEASE } };
-                    branch 'dev_jdk8';
+                    branch 'dev';
                 }
             }
             steps {
@@ -147,51 +147,6 @@ pipeline {
                 }
             }
         }
-        stage('Deploy to DEV2') {
-            environment {
-                GIT_CREDENTIALS = credentials('4b740850-d7e0-4ab2-9eee-ecd1607e1e02')
-                SERVICE_VOCABULARY = "${env.WORKSPACE}/service-vocabulary.yml"
-                HOSTS_VOCABULARY = "${env.WORKSPACE}/hosts-vocabulary"
-                BUILD_HOSTS = "${BUILD_ID}_hosts"
-            }
-            when {
-                allOf {
-                    not { expression { params.RELEASE } };
-                    branch 'dev';
-                }
-            }
-            steps {
-                sshagent(['85f1747d-ea03-49ca-9e5d-aa9b7bc01c5f']) {
-                    sh '''
-                rm -rf *
-                git clone -b master git@github.com:gbif/gbif-configuration.git
-                git clone -b master git@github.com:gbif/c-deploy.git
-               '''
-
-                    createServiceFile("${env.WORKSPACE}/gbif-configuration/environments/dev2/services.yml")
-                    createHostsFile()
-
-                    sh """
-                cd c-deploy/services
-                echo "Creating group_vars directory"
-                mkdir group_vars
-
-                # Configuration and services files are concatenated into a single file, that will contain the Ansible variables
-                cat ../../gbif-configuration/environments/dev2/configuration.yml \
-                    ../../gbif-configuration/environments/dev2/monitoring.yml \
-                    ${SERVICE_VOCABULARY} >> group_vars/${BUILD_ID}
-
-                # The default Ansible inventory file 'hosts' is concatenated with the input HOSTS file
-                cat ../../gbif-configuration/environments/dev2/hosts \
-                    ${HOSTS_VOCABULARY} >> ${BUILD_HOSTS}
-
-                # Executes the Ansible playbook
-                echo "Executing Ansible playbook"
-                ansible-playbook -vvv -i ${BUILD_HOSTS} services.yml --private-key=~/.ssh/id_rsa --extra-vars "git_credentials=${GIT_CREDENTIALS}"
-              """
-                }
-            }
-        }
     }
     post {
         failure {
diff --git a/api/src/main/java/org/gbif/vocabulary/api/ConceptView.java b/api/src/main/java/org/gbif/vocabulary/api/ConceptView.java
index 323821e8..863b5917 100644
--- a/api/src/main/java/org/gbif/vocabulary/api/ConceptView.java
+++ b/api/src/main/java/org/gbif/vocabulary/api/ConceptView.java
@@ -29,7 +29,6 @@
 public class ConceptView implements Serializable, EntityView<Concept> {
 
   @JsonUnwrapped private Concept concept;
-  private String vocabularyName;
   private List<String> parents;
   private Integer childrenCount;
   private List<String> children;
@@ -49,21 +48,37 @@ public ConceptView(Concept concept, Integer childrenCount) {
     this.childrenCount = childrenCount;
   }
 
+  public Concept getConcept() {
+    return concept;
+  }
+
   public ConceptView setConcept(Concept concept) {
     this.concept = concept;
     return this;
   }
 
+  public List<String> getParents() {
+    return parents;
+  }
+
   public ConceptView setParents(List<String> parents) {
     this.parents = parents;
     return this;
   }
 
+  public Integer getChildrenCount() {
+    return childrenCount;
+  }
+
   public ConceptView setChildrenCount(Integer childrenCount) {
     this.childrenCount = childrenCount;
     return this;
   }
 
+  public List<String> getChildren() {
+    return children;
+  }
+
   public ConceptView setChildren(List<String> children) {
     this.children = children;
     return this;
@@ -79,11 +94,6 @@ public ConceptView setHiddenLabelsLink(String hiddenLabelsLink) {
     return this;
   }
 
-  public ConceptView setVocabularyName(String vocabularyName) {
-    this.vocabularyName = vocabularyName;
-    return this;
-  }
-
   @Override
   public Concept getEntity() {
     return concept;
diff --git a/core/src/main/java/org/gbif/vocabulary/persistence/dto/ParentDto.java b/core/src/main/java/org/gbif/vocabulary/persistence/dto/ParentDto.java
deleted file mode 100644
index d640eab7..00000000
--- a/core/src/main/java/org/gbif/vocabulary/persistence/dto/ParentDto.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.gbif.vocabulary.persistence.dto;
-
-import lombok.Data;
-
-import org.gbif.vocabulary.model.LanguageRegion;
-
-@Data
-public class ParentDto {
-  long key;
-  String name;
-  int depth;
-  Long labelKey;
-  LanguageRegion labelLanguage;
-  String labelValue;
-}
diff --git a/core/src/main/java/org/gbif/vocabulary/persistence/dto/SuggestDto.java b/core/src/main/java/org/gbif/vocabulary/persistence/dto/SuggestDto.java
deleted file mode 100644
index 15d4b41b..00000000
--- a/core/src/main/java/org/gbif/vocabulary/persistence/dto/SuggestDto.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.gbif.vocabulary.persistence.dto;
-
-import org.gbif.vocabulary.model.Label;
-
-import java.util.List;
-
-import lombok.Data;
-
-@Data
-public class SuggestDto {
-
-  private long key;
-  private String name;
-  private List<Label> labels;
-  private List<ParentDto> parentDtos;
-}
diff --git a/core/src/main/java/org/gbif/vocabulary/persistence/mappers/ConceptMapper.java b/core/src/main/java/org/gbif/vocabulary/persistence/mappers/ConceptMapper.java
index b7404ff1..e02f0fa5 100644
--- a/core/src/main/java/org/gbif/vocabulary/persistence/mappers/ConceptMapper.java
+++ b/core/src/main/java/org/gbif/vocabulary/persistence/mappers/ConceptMapper.java
@@ -31,8 +31,6 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import org.gbif.vocabulary.persistence.dto.SuggestDto;
-
 /** Mapper for {@link Concept}. */
 @Mapper
 public interface ConceptMapper extends BaseMapper<Concept> {
@@ -55,11 +53,10 @@ void deprecateInBulk(
 
   void updateParent(@Param("keys") List<Long> conceptKeys, @Param("parentKey") long parentKey);
 
-  List<SuggestDto> suggest(
+  List<KeyNameResult> suggest(
       @Param("query") String query,
       @Param("vocabularyKey") long vocabularyKey,
-      @Nullable @Param("lang") LanguageRegion language,
-      @Nullable @Param("fallbackLang") LanguageRegion fallbackLang);
+      @Nullable @Param("lang") LanguageRegion language);
 
   /**
    * Given a deprecated concept, it finds the current replacement, that's to say, the first
@@ -151,11 +148,10 @@ long countLatestRelease(
       @Nullable @Param("params") ConceptSearchParams params,
       @Param("vocabName") String vocabularyName);
 
-  List<SuggestDto> suggestLatestRelease(
+  List<KeyNameResult> suggestLatestRelease(
       @Param("query") String query,
       @Param("vocabularyKey") long vocabularyKey,
-      @Nullable @Param("lang") LanguageRegion languageFilter,
-      @Nullable @Param("fallbackLang") LanguageRegion fallbackLang,
+      @Nullable @Param("lang") LanguageRegion language,
       @Param("vocabName") String vocabularyName);
 
   List<String> findParentsLatestRelease(
diff --git a/core/src/main/java/org/gbif/vocabulary/service/ConceptService.java b/core/src/main/java/org/gbif/vocabulary/service/ConceptService.java
index 99eb2726..374634a4 100644
--- a/core/src/main/java/org/gbif/vocabulary/service/ConceptService.java
+++ b/core/src/main/java/org/gbif/vocabulary/service/ConceptService.java
@@ -60,14 +60,10 @@ public interface ConceptService extends BaseService<Concept> {
    * @param query suggestion
    * @param vocabularyKey key of the vocabulary
    * @param languageRegion locale to filter by
-   * @param fallbackLanguageRegion fallback locale to show in the response
    * @return a list of up to 20 suggested concepts
    */
   List<KeyNameResult> suggest(
-      String query,
-      long vocabularyKey,
-      @Nullable LanguageRegion languageRegion,
-      @Nullable LanguageRegion fallbackLanguageRegion);
+      String query, long vocabularyKey, @Nullable LanguageRegion languageRegion);
 
   /**
    * Deprecates a concept with a replacement.
@@ -187,14 +183,13 @@ PagingResponse<Concept> listLatestRelease(
       @Nullable ConceptSearchParams params, @Nullable Pageable page, String vocabularyName);
 
   /**
-   * It works as {@link #suggest(String, long, LanguageRegion, LanguageRegion)} but it queries the
-   * latest release of the vocabulary instead of the actual data.
+   * It works as {@link #suggest(String, long, LanguageRegion)} but it queries the latest release of
+   * the vocabulary instead of the actual data.
    */
   List<KeyNameResult> suggestLatestRelease(
       String query,
       long vocabularyKey,
       @Nullable LanguageRegion languageRegion,
-      @Nullable LanguageRegion fallbackLanguageRegion,
       String vocabularyName);
 
   /**
diff --git a/core/src/main/java/org/gbif/vocabulary/service/impl/DefaultConceptService.java b/core/src/main/java/org/gbif/vocabulary/service/impl/DefaultConceptService.java
index c08929b7..21a9ea84 100644
--- a/core/src/main/java/org/gbif/vocabulary/service/impl/DefaultConceptService.java
+++ b/core/src/main/java/org/gbif/vocabulary/service/impl/DefaultConceptService.java
@@ -28,17 +28,13 @@
 import org.gbif.vocabulary.model.search.KeyNameResult;
 import org.gbif.vocabulary.model.utils.PostPersist;
 import org.gbif.vocabulary.model.utils.PrePersist;
-import org.gbif.vocabulary.persistence.dto.ParentDto;
-import org.gbif.vocabulary.persistence.dto.SuggestDto;
 import org.gbif.vocabulary.persistence.mappers.ConceptMapper;
 import org.gbif.vocabulary.persistence.mappers.VocabularyMapper;
 import org.gbif.vocabulary.service.ConceptService;
 
-import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -178,81 +174,9 @@ public PagingResponse<Concept> list(
 
   @Override
   public List<KeyNameResult> suggest(
-      String query,
-      long vocabularyKey,
-      @Nullable LanguageRegion languageRegion,
-      @Nullable LanguageRegion fallbackLanguageRegion) {
+      String query, long vocabularyKey, @Nullable LanguageRegion languageRegion) {
     query = query != null ? query : "";
-    List<SuggestDto> dtos =
-        conceptMapper.suggest(query, vocabularyKey, languageRegion, fallbackLanguageRegion);
-
-    return convertSuggestResults(languageRegion, fallbackLanguageRegion, dtos);
-  }
-
-  private static List<KeyNameResult> convertSuggestResults(
-      LanguageRegion languageRegion, LanguageRegion fallbackLanguageRegion, List<SuggestDto> dtos) {
-    return dtos.stream()
-        .map(
-            dto -> {
-              KeyNameResult keyNameResult = new KeyNameResult();
-              keyNameResult.setKey(dto.getKey());
-              keyNameResult.setName(dto.getName());
-              keyNameResult.setLabels(dto.getLabels());
-
-              Function<List<Label>, List<Label>> filterLabels =
-                  labels -> {
-                    if (languageRegion != null && fallbackLanguageRegion != null) {
-                      // keep only the ones of the language requested if they exist
-                      List<Label> langLabels =
-                          labels.stream()
-                              .filter(l -> l.getLanguage().equals(languageRegion))
-                              .collect(Collectors.toList());
-
-                      if (!langLabels.isEmpty()) {
-                        return langLabels;
-                      }
-                    }
-                    return labels;
-                  };
-
-              keyNameResult.setLabels(filterLabels.apply(dto.getLabels()));
-
-              keyNameResult.setParents(
-                  dto.getParentDtos().stream()
-                      .collect(
-                          Collectors.toMap(
-                              ParentDto::getKey,
-                              p -> {
-                                KeyNameResult.Parent parent = new KeyNameResult.Parent();
-                                parent.setKey(p.getKey());
-                                parent.setName(p.getName());
-                                parent.setDepth(p.getDepth());
-                                Label label =
-                                    Label.builder()
-                                        .key(p.getLabelKey())
-                                        .value(p.getLabelValue())
-                                        .language(p.getLabelLanguage())
-                                        .build();
-                                parent.getLabels().add(label);
-                                return parent;
-                              },
-                              (p1, p2) -> {
-                                p1.getLabels().addAll(p2.getLabels());
-                                return p1;
-                              }))
-                      .values()
-                      .stream()
-                      .map(
-                          p -> {
-                            p.setLabels(filterLabels.apply(p.getLabels()));
-                            return p;
-                          })
-                      .sorted(Comparator.comparing(KeyNameResult.Parent::getDepth))
-                      .collect(Collectors.toList()));
-
-              return keyNameResult;
-            })
-        .collect(Collectors.toList());
+    return conceptMapper.suggest(query, vocabularyKey, languageRegion);
   }
 
   @Secured({UserRoles.VOCABULARY_ADMIN, UserRoles.VOCABULARY_EDITOR})
@@ -556,24 +480,13 @@ public PagingResponse<Concept> listLatestRelease(
 
   @Override
   public List<KeyNameResult> suggestLatestRelease(
-      String query,
-      long vocabularyKey,
-      LanguageRegion languageRegion,
-      LanguageRegion fallbackLanguageRegion,
-      String vocabularyName) {
+      String query, long vocabularyKey, LanguageRegion languageRegion, String vocabularyName) {
     checkArgument(!Strings.isNullOrEmpty(vocabularyName));
     checkArgument(conceptMapper.existsReleaseView(vocabularyName.toLowerCase()));
 
     query = query != null ? query : "";
-    List<SuggestDto> dtos =
-        conceptMapper.suggestLatestRelease(
-            query,
-            vocabularyKey,
-            languageRegion,
-            fallbackLanguageRegion,
-            vocabularyName.toLowerCase());
-
-    return convertSuggestResults(languageRegion, fallbackLanguageRegion, dtos);
+    return conceptMapper.suggestLatestRelease(
+        query, vocabularyKey, languageRegion, vocabularyName.toLowerCase());
   }
 
   @Override
diff --git a/core/src/main/resources/core.properties b/core/src/main/resources/core.properties
index 7ce19981..d67d2e41 100644
--- a/core/src/main/resources/core.properties
+++ b/core/src/main/resources/core.properties
@@ -1,3 +1,3 @@
 mybatis.type-handlers-package=org.gbif.vocabulary.persistence.handlers
-mybatis.type-aliases-package=org.gbif.vocabulary.model;org.gbif.vocabulary.persistence.handlers;org.gbif.vocabulary.persistence.dto
-mybatis.configuration.map-underscore-to-camel-case=true
+mybatis.type-aliases-package=org.gbif.vocabulary.model;org.gbif.vocabulary.persistence.handlers
+mybatis.configuration.map-underscore-to-camel-case=true
\ No newline at end of file
diff --git a/core/src/main/resources/org/gbif/vocabulary/persistence/mappers/ConceptMapper.xml b/core/src/main/resources/org/gbif/vocabulary/persistence/mappers/ConceptMapper.xml
index b16eba8d..901245a9 100644
--- a/core/src/main/resources/org/gbif/vocabulary/persistence/mappers/ConceptMapper.xml
+++ b/core/src/main/resources/org/gbif/vocabulary/persistence/mappers/ConceptMapper.xml
@@ -12,10 +12,9 @@
     <collection property="label" column="{entityKey=key}" select="listConceptLabels"/>
   </resultMap>
 
-  <resultMap id="KEY_NAME_RESULT_MAP" type="SuggestDto" autoMapping="true">
+  <resultMap id="KEY_NAME_RESULT_MAP" type="KeyNameResult" autoMapping="true">
     <id property="key" column="key"/>
-    <collection property="labels" column="{entityKey=key,lang=lang,fallbackLang=fallbackLang}" select="listConceptLabels"/>
-    <collection property="parentDtos" column="{key=key,lang=lang,fallbackLang=fallbackLang}" select="findParentsLabels"/>
+    <collection property="labels" column="{entityKey=key,lang=lang}" select="listConceptLabels"/>
   </resultMap>
 
   <resultMap id="DEFINITION_RESULT_MAP" type="Definition" autoMapping="true">
@@ -28,11 +27,6 @@
     <result property="language" column="language" typeHandler="LanguageRegionTypeHandler"/>
   </resultMap>
 
-  <resultMap id="PARENT_RESULT_MAP" type="ParentDto" autoMapping="true">
-    <id property="key" column="key"/>
-    <result property="labelLanguage" column="labelLanguage" typeHandler="LanguageRegionTypeHandler"/>
-  </resultMap>
-
   <resultMap id="HIDDEN_LABEL_RESULT_MAP" type="HiddenLabel" autoMapping="true">
     <id property="key" column="key"/>
     <result property="entityKey" column="concept_key"/>
@@ -149,9 +143,7 @@
   </sql>
 
   <sql id="SUGGEST">
-    SELECT DISTINCT ON(key) key, name, #{lang} lang
-      <if test="_parameter.containsKey('fallbackLang')">,#{fallbackLang} fallbackLang</if>
-      <if test="_parameter.containsKey('vocabName')">, #{vocabName} vocabName</if>
+    SELECT DISTINCT ON(key) key, name, #{lang} lang <if test="_parameter.containsKey('vocabName')">, #{vocabName} vocabName</if>
     FROM (
       (SELECT key, name
       FROM concept${table_suffix}
@@ -183,16 +175,6 @@
         AND cl.language = #{lang}
       </if>
       LIMIT 20 )
-    <if test="fallbackLang != null">
-      UNION ALL
-        (SELECT DISTINCT c.key, c.name
-        FROM concept${table_suffix} c
-        JOIN concept_label${table_suffix} cl ON cl.concept_key = c.key
-        WHERE c.vocabulary_key = #{vocabularyKey} AND cl.value ilike #{query}||'%'
-        AND c.deprecated IS NULL
-        AND cl.language = #{fallbackLang}
-        LIMIT 20 )
-    </if>
     ) t1 LIMIT 20
   </sql>
 
@@ -215,36 +197,6 @@
     SELECT name FROM parents WHERE key != #{key,jdbcType=BIGINT};
   </sql>
 
-  <select id="findParentsLabels" resultMap="PARENT_RESULT_MAP">
-    <bind name="table_suffix" value="''"/>
-    <include refid="FIND_PARENTS_LABELS"/>
-  </select>
-
-  <sql id="FIND_PARENTS_LABELS">
-    WITH RECURSIVE parents(key, name, parent_key, deprecated) AS (
-    SELECT root.key, root.name, root.parent_key, root.deprecated, 0 AS depth
-    FROM concept${table_suffix} root
-    WHERE key = #{key,jdbcType=BIGINT} AND deprecated IS NULL AND parent_key IS NOT NULL
-    UNION
-    SELECT c.key, c.name, c.parent_key, c.deprecated, p.depth + 1
-    FROM parents p, concept${table_suffix} c
-    WHERE p.parent_key = c.key )
-    SELECT p.key, p.name, p.depth , cl.key AS labelKey, cl.language AS labelLanguage, cl.value AS labelValue
-    FROM parents p
-    LEFT JOIN concept_label${table_suffix} cl ON cl.concept_key = p.key
-      <if test="lang != null or fallbackLang != null">
-        AND (
-        <if test="lang != null">
-          cl.language = #{lang}
-        </if>
-        <if test="fallbackLang != null">
-          OR cl.language = #{fallbackLang}
-        </if>
-        )
-      </if>
-    WHERE p.key != #{key,jdbcType=BIGINT};
-  </sql>
-
   <sql id="LIST_CONCEPTS_DEFINITION">
     SELECT key, language, value, created_by, created, modified_by, modified
     FROM concept_definition${table_suffix}
@@ -255,19 +207,10 @@
   <sql id="LIST_CONCEPTS_LABELS">
     SELECT <include refid="LABEL_FIELDS"/>
     FROM concept_label${table_suffix}
-    <where>
-      concept_key = #{entityKey,jdbcType=BIGINT}
-      <if test="lang != null or fallbackLang != null">
-        AND (
-        <if test="lang != null">
-          language = #{lang}
-        </if>
-        <if test="fallbackLang != null">
-          OR language = #{fallbackLang}
-        </if>
-        )
-      </if>
-    </where>
+    WHERE concept_key = #{entityKey,jdbcType=BIGINT}
+    <if test="lang != null">
+      AND language = #{lang}
+    </if>
     ORDER BY key DESC
   </sql>
 
@@ -744,11 +687,6 @@
     <include refid="FIND_PARENTS"/>
   </select>
 
-  <select id="findParentsLabelsLatestRelease" resultMap="PARENT_RESULT_MAP">
-    <bind name="table_suffix" value="''"/>
-    <include refid="FIND_PARENTS_LABELS"/>
-  </select>
-
   <select id="getByNameLatestRelease" resultMap="CONCEPT_MAP_RELEASE_VIEW">
     SELECT
     <include refid="CONCEPT_READ_FIELDS"/>, #{vocabName} vocabName
@@ -805,12 +743,9 @@
     <collection property="label" column="{entityKey=key,vocabName=vocabName}" select="listConceptLabelsLatestRelease"/>
   </resultMap>
 
-  <resultMap id="KEY_NAME_RESULT_MAP_RELEASE_VIEW" type="SuggestDto" autoMapping="true">
+  <resultMap id="KEY_NAME_RESULT_MAP_RELEASE_VIEW" type="KeyNameResult" autoMapping="true">
     <id property="key" column="key"/>
-    <collection property="labels" column="{entityKey=key,vocabName=vocabName,lang=lang,fallbackLang=fallbackLang}"
-                select="listConceptLabelsLatestRelease"/>
-    <collection property="parentDtos" column="{key=key,lang=lang,fallbackLang=fallbackLang}" select="findParentsLabelsLatestRelease"/>
+    <collection property="labels" column="{entityKey=key,vocabName=vocabName,lang=lang}" select="listConceptLabelsLatestRelease"/>
   </resultMap>
 
-
 </mapper>
diff --git a/core/src/test/java/org/gbif/vocabulary/persistence/mappers/ConceptMapperTest.java b/core/src/test/java/org/gbif/vocabulary/persistence/mappers/ConceptMapperTest.java
index c2077ace..1ba36543 100644
--- a/core/src/test/java/org/gbif/vocabulary/persistence/mappers/ConceptMapperTest.java
+++ b/core/src/test/java/org/gbif/vocabulary/persistence/mappers/ConceptMapperTest.java
@@ -25,7 +25,6 @@
 import org.gbif.vocabulary.model.search.ChildrenResult;
 import org.gbif.vocabulary.model.search.ConceptSearchParams;
 import org.gbif.vocabulary.model.search.KeyNameResult;
-import org.gbif.vocabulary.persistence.dto.SuggestDto;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -221,7 +220,6 @@ public void suggestTest() {
 
     Concept c2 = createNewEntity();
     c2.setName("Suggest222");
-
     conceptMapper.create(c2);
     assertNotNull(c2.getKey());
 
@@ -235,7 +233,7 @@ public void suggestTest() {
         c2.getKey(), HiddenLabel.builder().value("lbel").createdBy("test").build());
 
     // check result values
-    List<SuggestDto> result = conceptMapper.suggest("suggest1", c1.getVocabularyKey(), null, null);
+    List<KeyNameResult> result = conceptMapper.suggest("suggest1", c1.getVocabularyKey(), null);
     assertEquals("Suggest111", result.get(0).getName());
     assertEquals(c1.getKey().intValue(), result.get(0).getKey());
 
@@ -244,19 +242,16 @@ public void suggestTest() {
         DEFAULT_VOCABULARY.toLowerCase(), vocabularies[0].getKey());
 
     // assert expected number of results
-    assertSuggest(2, "su", c1.getVocabularyKey(), null, null);
-    assertSuggest(2, "gge", c1.getVocabularyKey(), null, null);
-    assertSuggest(1, "22", c1.getVocabularyKey(), null, null);
-    assertSuggest(0, "zz", c1.getVocabularyKey(), null, null);
-    assertSuggest(0, null, c1.getVocabularyKey(), null, null);
-    assertSuggest(2, "label", c1.getVocabularyKey(), null, null);
-    assertSuggest(1, "labeleng", c1.getVocabularyKey(), null, null);
-    assertSuggest(0, "labeleng", c1.getVocabularyKey(), LanguageRegion.SPANISH, null);
-    assertSuggest(1, "labeleng", c1.getVocabularyKey(), LanguageRegion.ENGLISH, null);
-    // should get fallback lang
-    assertSuggest(2, "su", c1.getVocabularyKey(), LanguageRegion.ARPITAN, LanguageRegion.ENGLISH);
-    assertSuggest(2, "su", c1.getVocabularyKey(), LanguageRegion.ARPITAN, LanguageRegion.SPANISH);
-    assertSuggest(2, "su", c1.getVocabularyKey(), LanguageRegion.ARPITAN, LanguageRegion.AFRIKAANS);
+    assertSuggest(2, "su", c1.getVocabularyKey(), null);
+    assertSuggest(2, "gge", c1.getVocabularyKey(), null);
+    assertSuggest(1, "22", c1.getVocabularyKey(), null);
+    assertSuggest(0, "zz", c1.getVocabularyKey(), null);
+    assertSuggest(0, null, c1.getVocabularyKey(), null);
+    assertSuggest(2, "label", c1.getVocabularyKey(), null);
+    assertSuggest(1, "labeleng", c1.getVocabularyKey(), null);
+    assertSuggest(0, "labeleng", c1.getVocabularyKey(), LanguageRegion.SPANISH);
+    assertSuggest(1, "labeleng", c1.getVocabularyKey(), LanguageRegion.ENGLISH);
+    assertSuggest(1, "labeleng", c1.getVocabularyKey(), LanguageRegion.ENGLISH);
 
     Concept c3 = createNewEntity();
     c3.setVocabularyKey(vocabularies[1].getKey());
@@ -264,22 +259,17 @@ public void suggestTest() {
     conceptMapper.create(c3);
     assertNotNull(c3.getKey());
 
-    assertEquals(2, conceptMapper.suggest("su", c1.getVocabularyKey(), null, null).size());
-    assertEquals(1, conceptMapper.suggest("su", c3.getVocabularyKey(), null, null).size());
-    assertEquals(1, conceptMapper.suggest("33", c3.getVocabularyKey(), null, null).size());
-    assertEquals(0, conceptMapper.suggest("33", c1.getVocabularyKey(), null, null).size());
+    assertEquals(2, conceptMapper.suggest("su", c1.getVocabularyKey(), null).size());
+    assertEquals(1, conceptMapper.suggest("su", c3.getVocabularyKey(), null).size());
+    assertEquals(1, conceptMapper.suggest("33", c3.getVocabularyKey(), null).size());
+    assertEquals(0, conceptMapper.suggest("33", c1.getVocabularyKey(), null).size());
   }
 
-  private void assertSuggest(
-      int expectedSize,
-      String query,
-      long vocabKey,
-      LanguageRegion lang,
-      LanguageRegion fallbackLang) {
-    List<SuggestDto> result = conceptMapper.suggest(query, vocabKey, lang, fallbackLang);
+  private void assertSuggest(int expectedSize, String query, long vocabKey, LanguageRegion lang) {
+    List<KeyNameResult> result = conceptMapper.suggest(query, vocabKey, lang);
     assertEquals(expectedSize, result.size());
-    List<SuggestDto> resultRelease =
-        conceptMapper.suggestLatestRelease(query, vocabKey, lang, fallbackLang, DEFAULT_VOCABULARY);
+    List<KeyNameResult> resultRelease =
+        conceptMapper.suggestLatestRelease(query, vocabKey, lang, DEFAULT_VOCABULARY);
     assertEquals(expectedSize, resultRelease.size());
 
     if (lang != null) {
@@ -289,10 +279,7 @@ private void assertSuggest(
                   r ->
                       r.getLabels() == null
                           || r.getLabels().isEmpty()
-                          || r.getLabels().stream()
-                              .allMatch(
-                                  l ->
-                                      l.getLanguage() == lang || l.getLanguage() == fallbackLang)));
+                          || r.getLabels().stream().allMatch(l -> l.getLanguage() == lang)));
     }
   }
 
@@ -1012,9 +999,9 @@ public void releaseViewSubqueriesTest() {
     assertEquals(1, conceptsList.get(0).getDefinition().size());
     assertEquals(0, conceptsList.get(0).getLabel().size());
 
-    List<SuggestDto> suggestResult =
+    List<KeyNameResult> suggestResult =
         conceptMapper.suggestLatestRelease(
-            concept1.getName(), concept1.getVocabularyKey(), null, null, vocabName);
+            concept1.getName(), concept1.getVocabularyKey(), null, vocabName);
     assertEquals(0, suggestResult.get(0).getLabels().size());
 
     conceptMapper.updateReleaseViews(vocabName);
@@ -1033,7 +1020,7 @@ public void releaseViewSubqueriesTest() {
 
     suggestResult =
         conceptMapper.suggestLatestRelease(
-            concept1.getName(), concept1.getVocabularyKey(), null, null, vocabName);
+            concept1.getName(), concept1.getVocabularyKey(), null, vocabName);
     assertEquals(1, suggestResult.get(0).getLabels().size());
   }
 
diff --git a/core/src/test/java/org/gbif/vocabulary/service/ConceptServiceIT.java b/core/src/test/java/org/gbif/vocabulary/service/ConceptServiceIT.java
index a4cda2d4..42a02d64 100644
--- a/core/src/test/java/org/gbif/vocabulary/service/ConceptServiceIT.java
+++ b/core/src/test/java/org/gbif/vocabulary/service/ConceptServiceIT.java
@@ -25,7 +25,6 @@
 import org.gbif.vocabulary.model.UserRoles;
 import org.gbif.vocabulary.model.Vocabulary;
 import org.gbif.vocabulary.model.search.ConceptSearchParams;
-import org.gbif.vocabulary.model.search.KeyNameResult;
 import org.gbif.vocabulary.persistence.mappers.VocabularyMapper;
 
 import java.sql.Connection;
@@ -843,105 +842,6 @@ public void releaseViewTest() {
             .longValue());
   }
 
-  @Test
-  public void suggestTest() {
-    Concept c1 = createBasicConcept(vocabularies[0].getKey());
-    c1.setName("Suggest111");
-    long key1 = conceptService.create(c1);
-
-    conceptService.addLabel(
-        key1,
-        Label.builder()
-            .language(LanguageRegion.ENGLISH)
-            .value("labelenglish")
-            .createdBy("test")
-            .build());
-
-    conceptService.addLabel(
-        key1,
-        Label.builder()
-            .language(LanguageRegion.SPANISH)
-            .value("labelspanish")
-            .createdBy("test")
-            .build());
-
-    Concept c2 = createBasicConcept(vocabularies[0].getKey());
-    c2.setName("Suggest222");
-    c2.setParentKey(c1.getKey());
-    long key2 = conceptService.create(c2);
-
-    conceptService.addLabel(
-        key2,
-        Label.builder().language(LanguageRegion.ENGLISH).value("Label").createdBy("test").build());
-
-    Concept c3 = createBasicConcept(vocabularies[0].getKey());
-    c3.setName("Suggest333");
-    c3.setParentKey(c2.getKey());
-    long key3 = conceptService.create(c3);
-
-    conceptService.addLabel(
-        key3,
-        Label.builder().language(LanguageRegion.SPANISH).value("Label3").createdBy("test").build());
-
-    List<KeyNameResult> results =
-        conceptService.suggest("suggest", c1.getVocabularyKey(), null, null);
-    assertEquals(3, results.size());
-
-    results = conceptService.suggest("suggest222", c1.getVocabularyKey(), null, null);
-    assertEquals(1, results.size());
-    KeyNameResult result = results.get(0);
-    assertEquals(1, result.getParents().size());
-    KeyNameResult.Parent parent = result.getParents().get(0);
-    assertEquals(2, parent.getLabels().size());
-
-    results =
-        conceptService.suggest("suggest222", c1.getVocabularyKey(), LanguageRegion.SPANISH, null);
-    assertEquals(1, results.size());
-    result = results.get(0);
-    assertEquals(0, result.getLabels().size());
-    assertEquals(1, result.getParents().size());
-    parent = result.getParents().get(0);
-    assertEquals(1, parent.getLabels().size());
-    assertEquals(LanguageRegion.SPANISH, parent.getLabels().get(0).getLanguage());
-
-    results =
-        conceptService.suggest(
-            "suggest222", c1.getVocabularyKey(), LanguageRegion.SPANISH, LanguageRegion.ENGLISH);
-    assertEquals(1, results.size());
-    result = results.get(0);
-    assertEquals(1, result.getLabels().size());
-    assertEquals(LanguageRegion.ENGLISH, result.getLabels().get(0).getLanguage());
-    assertEquals(1, result.getParents().size());
-    parent = result.getParents().get(0);
-    assertEquals(1, parent.getLabels().size());
-    assertEquals(LanguageRegion.SPANISH, parent.getLabels().get(0).getLanguage());
-
-    results = conceptService.suggest("suggest333", c1.getVocabularyKey(), null, null);
-    assertEquals(1, results.size());
-    result = results.get(0);
-    assertEquals(2, result.getParents().size());
-    assertEquals(1, result.getLabels().size());
-
-    results =
-        conceptService.suggest("suggest333", c1.getVocabularyKey(), LanguageRegion.SPANISH, null);
-    assertEquals(1, results.size());
-    result = results.get(0);
-    assertEquals(1, result.getLabels().size());
-    assertEquals(LanguageRegion.SPANISH, result.getLabels().get(0).getLanguage());
-    assertEquals(2, result.getParents().size());
-
-    results =
-        conceptService.suggest(
-            "suggest333", c1.getVocabularyKey(), LanguageRegion.SPANISH, LanguageRegion.ENGLISH);
-    assertEquals(1, results.size());
-    result = results.get(0);
-    assertEquals(1, result.getLabels().size());
-    assertEquals(LanguageRegion.SPANISH, result.getLabels().get(0).getLanguage());
-    assertEquals(2, result.getParents().size());
-    assertEquals(key2, result.getParents().get(0).getKey());
-    assertEquals(key1, result.getParents().get(1).getKey());
-  }
-
   static class ContexInitializer
       implements ApplicationContextInitializer<ConfigurableApplicationContext> {
     public void initialize(ConfigurableApplicationContext configurableApplicationContext) {
diff --git a/model/src/main/java/org/gbif/vocabulary/model/search/KeyNameResult.java b/model/src/main/java/org/gbif/vocabulary/model/search/KeyNameResult.java
index 8a215676..dbef39e5 100644
--- a/model/src/main/java/org/gbif/vocabulary/model/search/KeyNameResult.java
+++ b/model/src/main/java/org/gbif/vocabulary/model/search/KeyNameResult.java
@@ -15,7 +15,6 @@
 
 import org.gbif.vocabulary.model.Label;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import lombok.Data;
@@ -28,14 +27,5 @@
 public class KeyNameResult {
   private long key;
   private String name;
-  private List<Label> labels = new ArrayList<>();
-  private List<Parent> parents = new ArrayList<>();
-
-  @Data
-  public static class Parent {
-    private long key;
-    private String name;
-    private int depth;
-    private List<Label> labels = new ArrayList<>();
-  }
+  private List<Label> labels;
 }
diff --git a/vocabulary-rest-ws-client/src/main/java/org/gbif/vocabulary/client/ConceptClient.java b/vocabulary-rest-ws-client/src/main/java/org/gbif/vocabulary/client/ConceptClient.java
index 44206ea4..be815e5a 100644
--- a/vocabulary-rest-ws-client/src/main/java/org/gbif/vocabulary/client/ConceptClient.java
+++ b/vocabulary-rest-ws-client/src/main/java/org/gbif/vocabulary/client/ConceptClient.java
@@ -309,7 +309,6 @@ class ListParams {
   @AllArgsConstructor(staticName = "of")
   class SuggestParams {
     LanguageRegion locale;
-    LanguageRegion fallbackLocale;
     String q;
   }
 }
diff --git a/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resolvers/LanguageRegionHandlerMethodArgumentResolver.java b/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resolvers/LanguageRegionHandlerMethodArgumentResolver.java
index 4706a116..af197987 100644
--- a/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resolvers/LanguageRegionHandlerMethodArgumentResolver.java
+++ b/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resolvers/LanguageRegionHandlerMethodArgumentResolver.java
@@ -25,6 +25,8 @@
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
+import sun.reflect.generics.reflectiveObjects.ParameterizedTypeImpl;
+
 public class LanguageRegionHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
 
   @Override
@@ -73,9 +75,10 @@ private LanguageRegion convertToLanguageRegion(String locale) {
 
   private boolean isList(MethodParameter parameter) {
     return List.class.equals(parameter.getParameterType())
-        && parameter
-            .getGenericParameterType()
-            .getTypeName()
-            .contains(LanguageRegion.class.getName());
+        && LanguageRegion.class
+            .getName()
+            .equals(
+                ((ParameterizedTypeImpl) parameter.getGenericParameterType())
+                    .getActualTypeArguments()[0].getTypeName());
   }
 }
diff --git a/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/ConceptResource.java b/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/ConceptResource.java
index ae2da211..534aee14 100644
--- a/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/ConceptResource.java
+++ b/vocabulary-rest-ws/src/main/java/org/gbif/vocabulary/restws/resources/ConceptResource.java
@@ -232,11 +232,7 @@ public PagingResponse<ConceptView> listConcepts(
 
     Stream<ConceptView> viewStream =
         createConceptViewStream(
-            conceptsPage,
-            params,
-            conceptService::countChildren,
-            conceptService::findParents,
-            vocabularyName);
+            conceptsPage, params, conceptService::countChildren, conceptService::findParents);
 
     // labels links
     viewStream =
@@ -290,8 +286,7 @@ public ConceptView get(
       return null;
     }
 
-    ConceptView conceptView =
-        createConceptView(includeParents, includeChildren, concept, vocabularyName);
+    ConceptView conceptView = createConceptView(includeParents, includeChildren, concept);
 
     return createLabelsLinks(conceptView, vocabularyName, conceptName);
   }
@@ -370,10 +365,8 @@ public ConceptView update(
   public List<KeyNameResult> suggest(
       @PathVariable("vocabularyName") String vocabularyName,
       @RequestParam(value = "q", required = false) String query,
-      LanguageRegion locale,
-      LanguageRegion fallbackLocale) {
-    return conceptService.suggest(
-        query, getVocabularyWithCheck(vocabularyName).getKey(), locale, fallbackLocale);
+      LanguageRegion locale) {
+    return conceptService.suggest(query, getVocabularyWithCheck(vocabularyName).getKey(), locale);
   }
 
   @Operation(
@@ -856,8 +849,7 @@ public PagingResponse<ConceptView> listConceptsLatestRelease(
             conceptsPage,
             params,
             v -> conceptService.countChildrenLatestRelease(v, vocabularyName),
-            v -> conceptService.findParentsLatestRelease(v, vocabularyName),
-            vocabularyName);
+            v -> conceptService.findParentsLatestRelease(v, vocabularyName));
 
     // labels links
     viewStream =
@@ -901,8 +893,7 @@ public ConceptView getFromLatestRelease(
       return null;
     }
 
-    ConceptView conceptView =
-        createConceptView(includeParents, includeChildren, concept, vocabularyName);
+    ConceptView conceptView = createConceptView(includeParents, includeChildren, concept);
 
     return createLabelsLinks(conceptView, vocabularyName, LATEST_RELEASE_PATH + "/" + conceptName);
   }
@@ -925,14 +916,9 @@ public ConceptView getFromLatestRelease(
   public List<KeyNameResult> suggestLatestRelease(
       @PathVariable("vocabularyName") String vocabularyName,
       @RequestParam(value = "q", required = false) String query,
-      LanguageRegion locale,
-      LanguageRegion fallbackLocale) {
+      LanguageRegion locale) {
     return conceptService.suggestLatestRelease(
-        query,
-        getVocabularyWithCheck(vocabularyName).getKey(),
-        locale,
-        fallbackLocale,
-        vocabularyName);
+        query, getVocabularyWithCheck(vocabularyName).getKey(), locale, vocabularyName);
   }
 
   @Operation(
@@ -1023,14 +1009,12 @@ public PagingResponse<HiddenLabel> listHiddenLabelsFromLatestRelease(
   }
 
   private ConceptView createConceptView(
-      boolean includeParents, boolean includeChildren, Concept concept, String vocabularyName) {
+      boolean includeParents, boolean includeChildren, Concept concept) {
     if (concept == null) {
       return null;
     }
 
     ConceptView conceptView = new ConceptView(concept);
-    conceptView.setVocabularyName(vocabularyName);
-
     if (includeParents && concept.getParentKey() != null) {
       conceptView.setParents(conceptService.findParents(concept.getKey()));
     }
@@ -1070,12 +1054,8 @@ private Stream<ConceptView> createConceptViewStream(
       PagingResponse<Concept> conceptsPage,
       ConceptListParams params,
       Function<List<Long>, List<ChildrenResult>> childrenFn,
-      LongFunction<List<String>> parentsFn,
-      String vocabularyName) {
-    Stream<ConceptView> viewStream =
-        conceptsPage.getResults().stream()
-            .map(ConceptView::new)
-            .map(v -> v.setVocabularyName(vocabularyName));
+      LongFunction<List<String>> parentsFn) {
+    Stream<ConceptView> viewStream = conceptsPage.getResults().stream().map(ConceptView::new);
 
     // this could be simplified by keeping only 1 param but we leave the 2 of them for backwards
     // compatibility
diff --git a/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/ConceptResourceIT.java b/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/ConceptResourceIT.java
index f1667421..3260d278 100644
--- a/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/ConceptResourceIT.java
+++ b/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/ConceptResourceIT.java
@@ -476,7 +476,7 @@ public void releaseViewTest() {
         1,
         conceptClient
             .suggestLatestRelease(
-                defaultVocabularyName, ConceptClient.SuggestParams.of(null, null, c1.getName()))
+                defaultVocabularyName, ConceptClient.SuggestParams.of(null, c1.getName()))
             .size());
 
     assertEquals(
diff --git a/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/mock/ConceptResourceTest.java b/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/mock/ConceptResourceTest.java
index 72e89b86..fa4c0705 100644
--- a/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/mock/ConceptResourceTest.java
+++ b/vocabulary-rest-ws/src/test/java/org/gbif/vocabulary/restws/resources/mock/ConceptResourceTest.java
@@ -200,7 +200,7 @@ public void updateConceptWithWrongConceptName() throws Exception {
   public void suggestTest() throws Exception {
     mockVocabulary();
     List<KeyNameResult> suggestions = createSuggestions();
-    when(conceptService.suggest(anyString(), anyLong(), any(), any())).thenReturn(suggestions);
+    when(conceptService.suggest(anyString(), anyLong(), any())).thenReturn(suggestions);
     suggestTest(suggestions);
   }