diff --git a/src/DIRAC/WorkloadManagementSystem/DB/JobDB.sql b/src/DIRAC/WorkloadManagementSystem/DB/JobDB.sql
index 6b6704b364e..1bc7ec83b58 100755
--- a/src/DIRAC/WorkloadManagementSystem/DB/JobDB.sql
+++ b/src/DIRAC/WorkloadManagementSystem/DB/JobDB.sql
@@ -65,7 +65,8 @@ CREATE TABLE `Jobs` (
   KEY `MinorStatus` (`MinorStatus`),
   KEY `ApplicationStatus` (`ApplicationStatus`),
   KEY `StatusSite` (`Status`,`Site`),
-  KEY `LastUpdateTime` (`LastUpdateTime`)
+  KEY `LastUpdateTime` (`LastUpdateTime`),
+  KEY `JobName` (`JobName`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 -- ------------------------------------------------------------------------------
diff --git a/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql b/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql
index 7168e529f74..24cbe5a82b8 100755
--- a/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql
+++ b/src/DIRAC/WorkloadManagementSystem/DB/PilotAgentsDB.sql
@@ -45,7 +45,8 @@ CREATE TABLE `PilotAgents` (
   PRIMARY KEY (`PilotID`),
   KEY `PilotJobReference` (`PilotJobReference`),
   KEY `Status` (`Status`),
-  KEY `Statuskey` (`GridSite`,`DestinationSite`,`Status`)
+  KEY `Statuskey` (`GridSite`,`DestinationSite`,`Status`),
+  KEY `idx_dest_queue_status` (`DestinationSite`,`Queue`,`Status`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;