diff --git a/src/lib/Hydra/Helper/CatalystUtils.pm b/src/lib/Hydra/Helper/CatalystUtils.pm
index d4cf3f83..7de3a8ee 100644
--- a/src/lib/Hydra/Helper/CatalystUtils.pm
+++ b/src/lib/Hydra/Helper/CatalystUtils.pm
@@ -65,7 +65,7 @@ sub getChannelData {
     my ($c, $builds) = @_;
 
     my @builds2 = joinWithResultInfo($c, $builds)
-        ->search_literal("exists (select 1 from buildproducts where build = me.id and type = 'nix-build')");
+        ->search_literal("exists (select 1 from buildproducts where build = resultInfo.id and type = 'nix-build')");
     
     my @storePaths = ();
     foreach my $build (@builds2) {
diff --git a/src/lib/Hydra/Schema/Builds.pm b/src/lib/Hydra/Schema/Builds.pm
index e2ecbdbb..552b8e8e 100644
--- a/src/lib/Hydra/Schema/Builds.pm
+++ b/src/lib/Hydra/Schema/Builds.pm
@@ -289,14 +289,17 @@ QUERY
         <<QUERY
           select *
           from
-            (select project, jobset, job, system, max(id) as id
+            (select  
+               (select max(id) from builds b
+                where 
+                  project = activeJobs.project and jobset = activeJobs.jobset 
+                  and job = activeJobs.job and system = activeJobs.system 
+                  and finished = 1
+                  and exists (select 1 from buildresultinfo where id = b.id and buildstatus = 0)
+               ) as id
              from $activeJobs as activeJobs
-             natural join Builds
-             natural join BuildResultInfo
-             where finished = 1 and buildStatus = 0
-             group by project, jobset, job, system
             ) as latest
-          natural join Builds
+          join Builds using (id)
 QUERY
     );
 }
diff --git a/src/sql/hydra.sql b/src/sql/hydra.sql
index 938e2224..31ab282e 100644
--- a/src/sql/hydra.sql
+++ b/src/sql/hydra.sql
@@ -434,12 +434,13 @@ create index IndexBuildStepsOnOutpath on BuildSteps(outpath);
 create index IndexBuildStepsOnOutpathBuild on BuildSteps (outpath, build);
 create index IndexBuildsOnFinished on Builds(finished);
 create index IndexBuildsOnIsCurrent on Builds(isCurrent);
-create index IndexBuildsOnJob on Builds(project, jobset, job);
-create index IndexBuildsOnJobAndIsCurrent on Builds(project, jobset, job, isCurrent);
+#create index IndexBuildsOnJob on Builds(project, jobset, job);
+#create index IndexBuildsOnJobAndIsCurrent on Builds(project, jobset, job, isCurrent);
 create index IndexBuildsOnJobAndSystem on Builds(project, jobset, job, system);
 create index IndexBuildsOnJobset on Builds(project, jobset);
 create index IndexBuildsOnProject on Builds(project);
 create index IndexBuildsOnTimestamp on Builds(timestamp);
+create index IndexBuildsOnJobFinishedId on builds(project, jobset, job, system, finished, id DESC);
 create index IndexCachedGitInputsOnHash on CachedGitInputs(uri, branch, sha256hash);
 create index IndexCachedGitInputsOnLastSeen on CachedGitInputs(uri, branch, lastSeen);
 create index IndexCachedSubversionInputsOnUriRevision on CachedSubversionInputs(uri, revision);