diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 848921152..f03923ce5 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -210,7 +210,8 @@ module ReportsHelper
     repository = Repository.accessible_by_teams(report.team).where(name: repository_name).take
     return RepositoryRow.none if repository.blank?
 
-    my_modules = MyModule.where(experiment: { project: report.project })
+    my_modules = MyModule.joins(:experiment)
+                         .where(experiment: { project: report.project })
                          .where(id: report.report_elements.my_module.select(:my_module_id))
     repository.repository_rows.joins(:my_modules).where(my_modules: my_modules)
   end
diff --git a/app/views/reports/modals/_regenerate.html.erb b/app/views/reports/modals/_regenerate.html.erb
index a973188bf..9f06d718e 100644
--- a/app/views/reports/modals/_regenerate.html.erb
+++ b/app/views/reports/modals/_regenerate.html.erb
@@ -18,8 +18,8 @@
         </div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.no_button') %></button>
-        <button type="button" class="btn btn-primary btn-confirm"><%= t('general.yes_button') %></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><%= t('general.no') %></button>
+        <button type="button" class="btn btn-primary btn-confirm"><%= t('general.yes') %></button>
       </div>
     </div>
   </div>