diff --git a/admin/outcomes.php b/admin/outcomes.php
index f69076dd..f172438b 100644
--- a/admin/outcomes.php
+++ b/admin/outcomes.php
@@ -288,6 +288,7 @@ group by s.import_id";
 			WHERE a.outcome_id = '10'
 			AND a.case_id = b.case_id
 			AND b.questionnaire_id = '$questionnaire_id'
+			AND b.questionnaire_id = sh.questionnaire_id
 			AND sh.start <= a.start
 			AND sh.end >= a.start
 			GROUP BY sh.shift_id) as c on (s.shift_id = c.shift_id)
diff --git a/database/quexs.sql b/database/quexs.sql
index 28911a2d..96d52047 100644
--- a/database/quexs.sql
+++ b/database/quexs.sql
@@ -1562,7 +1562,9 @@ CREATE TABLE `shift` (
   `start` datetime NOT NULL,
   `end` datetime NOT NULL,
   PRIMARY KEY (`shift_id`),
-  KEY `questionnaire_id` (`questionnaire_id`)
+  KEY `questionnaire_id` (`questionnaire_id`),
+  KEY `start` (`start`),
+  KEY `end` (`end`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 -- --------------------------------------------------------