diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
index 519d1ef..5b2440f 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
@@ -232,6 +232,7 @@ public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_
       ),
     );
     foreach ($current_page as $key => $term) {
+      $uri = $term->uri();
       $form['terms'][$key]['#term'] = $term;
       $indentation = array();
       if (isset($term->depth) && $term->depth > 0) {
@@ -244,7 +245,7 @@ public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_
         '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
         '#type' => 'link',
         '#title' => $term->label(),
-        '#href' => "taxonomy/term/$term->id()",
+        '#href' => url($uri['path'], $uri['options']),
       );
       if ($taxonomy_vocabulary->hierarchy != TAXONOMY_HIERARCHY_MULTIPLE && count($tree) > 1) {
         $parent_fields = TRUE;
@@ -296,7 +297,7 @@ public function buildForm(array $form, array &$form_state, Vocabulary $taxonomy_
           'query' => $destination,
         ),
       );
-      if ($this->moduleHandler->invoke('translation_entity', 'translate_access', array($term))) {
+      if ($this->moduleHandler->invoke('content_translation', 'translate_access', array($term))) {
         $operations['translate'] = array(
           'title' => t('translate'),
           'href' => 'taxonomy/term/' . $term->id() . '/translations',