diff --git a/runbot/models/batch.py b/runbot/models/batch.py
index 6c5f4d01..eaea5f39 100644
--- a/runbot/models/batch.py
+++ b/runbot/models/batch.py
@@ -22,7 +22,7 @@ class Batch(models.Model):
     state = fields.Selection([('preparing', 'Preparing'), ('ready', 'Ready'), ('done', 'Done'), ('skipped', 'Skipped')])
     hidden = fields.Boolean('Hidden', default=False)
     age = fields.Integer(compute='_compute_age', string='Build age')
-    category_id = fields.Many2one('runbot.category', default=lambda self: self.env.ref('runbot.default_category', raise_if_not_found=False))
+    category_id = fields.Many2one('runbot.category', index=True, default=lambda self: self.env.ref('runbot.default_category', raise_if_not_found=False))
     log_ids = fields.One2many('runbot.batch.log', 'batch_id')
     has_warning = fields.Boolean("Has warning")
     base_reference_batch_id = fields.Many2one('runbot.batch')
diff --git a/runbot/models/branch.py b/runbot/models/branch.py
index daa7f64c..80079bd5 100644
--- a/runbot/models/branch.py
+++ b/runbot/models/branch.py
@@ -17,7 +17,7 @@ class Branch(models.Model):
     _sql_constraints = [('branch_repo_uniq', 'unique (name,remote_id)', 'The branch must be unique per repository !')]
 
     name = fields.Char('Name', required=True)
-    remote_id = fields.Many2one('runbot.remote', 'Remote', required=True, ondelete='cascade')
+    remote_id = fields.Many2one('runbot.remote', 'Remote', required=True, ondelete='cascade', index=True)
 
     head = fields.Many2one('runbot.commit', 'Head Commit', index=True)
     head_name = fields.Char('Head name', related='head.name', store=True)
@@ -29,7 +29,7 @@ class Branch(models.Model):
     pr_title = fields.Char('Pr Title')
     pr_body = fields.Char('Pr Body')
     pr_author = fields.Char('Pr Author')
-    
+
     pull_head_name = fields.Char(compute='_compute_branch_infos', string='PR HEAD name', readonly=1, store=True)
     pull_head_remote_id = fields.Many2one('runbot.remote', 'Pull head repository', compute='_compute_branch_infos', store=True, index=True)
     target_branch_name = fields.Char(compute='_compute_branch_infos', string='PR target branch', store=True)
diff --git a/runbot/models/build.py b/runbot/models/build.py
index 468ea9e1..0e26c4c3 100644
--- a/runbot/models/build.py
+++ b/runbot/models/build.py
@@ -51,7 +51,7 @@ class BuildParameters(models.Model):
     version_id = fields.Many2one('runbot.version', required=True, index=True)
     project_id = fields.Many2one('runbot.project', required=True, index=True)  # for access rights
     trigger_id = fields.Many2one('runbot.trigger', index=True)  # for access rights
-    create_batch_id = fields.Many2one('runbot.batch')
+    create_batch_id = fields.Many2one('runbot.batch', index=True)
     category = fields.Char('Category', index=True)  # normal vs nightly vs weekly, ...
     dockerfile_id = fields.Many2one('runbot.dockerfile', index=True, default=lambda self: self.env.ref('runbot.docker_default', raise_if_not_found=False))
     skip_requirements = fields.Boolean('Skip requirements.txt auto install')