diff --git a/productcomments.php b/productcomments.php
index 3ba52fd..381f65c 100644
--- a/productcomments.php
+++ b/productcomments.php
@@ -455,7 +455,7 @@ public function renderModerateLists()
             $helper->table = $this->name;
             $helper->table_id = 'waiting-approval-productcomments-list';
             $helper->token = Tools::getAdminTokenLite('AdminModules');
-            $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+            $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
             $helper->no_link = true;
 
             $return .= $helper->generateList($comments, $fields_list);
@@ -480,7 +480,7 @@ public function renderModerateLists()
         $helper->table = $this->name;
         $helper->table_id = 'reported-productcomments-list';
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
         $helper->no_link = true;
 
         $return .= $helper->generateList($comments, $fields_list);
@@ -564,7 +564,7 @@ public function renderCriterionList()
         $helper->title = $this->trans('Review Criteria', [], 'Modules.Productcomments.Admin');
         $helper->table = $this->name . 'criterion';
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
 
         return $helper->generateList($criterions, $fields_list);
     }
@@ -585,7 +585,7 @@ public function renderCommentsList()
         $helper->table = $this->name;
         $helper->table_id = 'approved-productcomments-list';
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->name;
+        $helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false, [], ['configure' => $this->name, 'tab_module' => $this->tab, 'module_name' => $this->name]);
         $helper->no_link = true;
 
         $page = ($page = Tools::getValue('submitFilter' . $helper->list_id)) ? (int) $page : 1;