diff --git a/report/doublons/doublons.php b/report/doublons/doublons.php
index 8cc719f..6654c54 100644
--- a/report/doublons/doublons.php
+++ b/report/doublons/doublons.php
@@ -640,7 +640,7 @@ function getLastInventory($computers_id)
 
     $query = $DB->request(['SELECT' => $field,
         'FROM' => $table,
-        'WHERE'  => ['computers_id' => $computers_id]]);
+        'WHERE'  => [($table === 'glpi_computers' ? 'id' : 'computers_id') => $computers_id]]);
 
     if (count($query) > 0) {
         foreach ($query as $id => $row) {
diff --git a/src/Profile.php b/src/Profile.php
index b4a0b76..e2be222 100644
--- a/src/Profile.php
+++ b/src/Profile.php
@@ -92,7 +92,7 @@ public static function showForReport($report)
         $canedit = Session::haveRight('profile', UPDATE);
 
         if ($canedit) {
-            echo "<form action='" . $_SERVER['PHP_SELF'] . "' method='post'>\n";
+            echo "<form action='" . $_SERVER['REQUEST_URI'] . "' method='post'>\n";
         }
 
         echo "<br><table class='tab_cadre_fixehov'>\n";