diff --git a/app/assets/javascripts/reports/new.js b/app/assets/javascripts/reports/new.js
index 0ec2bc788..a7aba901e 100644
--- a/app/assets/javascripts/reports/new.js
+++ b/app/assets/javascripts/reports/new.js
@@ -1327,6 +1327,17 @@ function reportHandsonTableConverter() {
     $.get($('#templateSelector').data('valuesEditorPath'), params, function(result) {
       $('.report-template-values-container').removeClass('hidden');
       $('.report-template-values-container').html(result.html);
+
+      $('.section').each(function() {
+        var section = $(this);
+        var collapseButton = section.find('.sn-icon-down');
+        var valuesContainer = section.find('.values-container');
+
+        if (valuesContainer.children().length === 0) {
+          collapseButton.hide();
+        }
+      });
+
       $('.report-template-value-dropdown').each(function() {
         dropdownSelector.init($(this), {
           noEmptyOption: true
diff --git a/app/jobs/reports/pdf_job.rb b/app/jobs/reports/pdf_job.rb
index 22d22b614..266d0e274 100644
--- a/app/jobs/reports/pdf_job.rb
+++ b/app/jobs/reports/pdf_job.rb
@@ -151,7 +151,7 @@ module Reports
     end
 
     def prepend_title_page(file, template, report, renderer)
-      unless File.exist?(Rails.root.join('app', 'views', 'reports', 'templates', template, 'cover'))
+      unless File.exist?(Rails.root.join('app', 'views', 'reports', 'templates', template, 'cover.html.erb'))
         return file
       end