diff --git a/app/javascript/views/plans/download.js b/app/javascript/views/plans/download.js
index 23362dc..e629812 100644
--- a/app/javascript/views/plans/download.js
+++ b/app/javascript/views/plans/download.js
@@ -15,7 +15,7 @@
     }
   });
 
-  $('#select-all-phase').on('click', (e) => {
+  $('#select-all-phases').on('click', (e) => {
     if (e.target.checked) {
       // Iterate each checkbox
       $('.phase-checkbox').each(function check() {
@@ -27,4 +27,17 @@
       });
     }
   });
+
+  $('#select-all-datasets').on('click', (e) => {
+    if (e.target.checked) {
+      // Iterate each checkbox
+      $('.dataset-checkbox').each(function check() {
+        this.checked = true;
+      });
+    } else {
+      $('.dataset-checkbox').each(function check() {
+        this.checked = false;
+      });
+    }
+  });
 });
diff --git a/app/views/branded/plans/_download_form.html.erb b/app/views/branded/plans/_download_form.html.erb
index e5c5f33..49789ee 100644
--- a/app/views/branded/plans/_download_form.html.erb
+++ b/app/views/branded/plans/_download_form.html.erb
@@ -6,8 +6,8 @@
     <div class="form-group datasets-selection">
       <strong><%= d_("dmpopidor", "Select datasets to download") %></strong>
       <ul>
-      <%= check_box_tag("select-all", "none", true, { id: "select-all-datasets" }) %>
-      <%= label_tag("select-all", d_('dmpopidor', 'All')) %>
+      <%= check_box_tag("select-all-datasets", "none", true, { id: "select-all-datasets" }) %>
+      <%= label_tag("select-all-datasets", d_('dmpopidor', 'All')) %>
       <% @datasets.each do |dataset| %>
         <li class="checkbox">
           <%= label_tag "selected_datasets[]" do %>
@@ -26,8 +26,8 @@
     <div class="form-group phase-selection">
       <strong><%= _("Select phase to download") %></strong>
       <ul>
-      <%= check_box_tag("select-all", "none", true, { id: "select-all-phase" }) %>
-      <%= label_tag("select-all", d_('dmpopidor', 'All')) %>
+      <%= check_box_tag("select-all-phases", "none", true, { id: "select-all-phases" }) %>
+      <%= label_tag("select-all-phases", d_('dmpopidor', 'All')) %>
       <% @phase_options.each do |phase| %>
         <li class="checkbox">
           <%= label_tag "selected_phases[]" do %>
diff --git a/app/views/branded/shared/export/_plan_coversheet.erb b/app/views/branded/shared/export/_plan_coversheet.erb
index f72fdb0..c1448a6 100644
--- a/app/views/branded/shared/export/_plan_coversheet.erb
+++ b/app/views/branded/shared/export/_plan_coversheet.erb
@@ -30,10 +30,10 @@
     <div style="margin-left: 15px;"><%= sanitize(@plan.description) %></div><br>
   <% end %>
 
-  <% if @plan.datasets.length > 1 %>
+  <% if @hash[:datasets].length > 1 || !@hash[:datasets][0].main?%>
     <p><%= _("Datasets: ") %></p>
     <ul>
-      <% @plan.datasets.each do |dataset| %>
+      <% @hash[:datasets].each do |dataset| %>
         <li><%= dataset.name %> - <%= dataset.description %></li>
       <% end %>
     </ul>
diff --git a/lib/dmpopidor/controllers/plan_exports.rb b/lib/dmpopidor/controllers/plan_exports.rb
index 6f68934..32aeceb 100644
--- a/lib/dmpopidor/controllers/plan_exports.rb
+++ b/lib/dmpopidor/controllers/plan_exports.rb
@@ -32,6 +32,10 @@
             if params.key?(:selected_phases)
                 @hash[:phases] = @hash[:phases].select { |p| params[:selected_phases].include?(p[:id].to_s)}
             end
+
+            if params.key?(:selected_datasets)
+                @hash[:datasets] = @hash[:datasets].select { |d| params[:selected_datasets].include?(d[:id].to_s)}
+            end
         
             respond_to do |format|
               format.html { show_html }