diff --git a/app/models/dataset.rb b/app/models/dataset.rb
index c1c275c..33316ea 100644
--- a/app/models/dataset.rb
+++ b/app/models/dataset.rb
@@ -30,8 +30,18 @@
       eql?(plan.datasets.where(order: 1).first)
     end
 
-    def has_common_answers?(section)
-      !Section.find(section[:id]).questions.flat_map(&:answers).select(&:is_common?).empty?
+    # Return main dataset
+    def get_main
+      plan.datasets.first
+    end
+
+    def has_common_answers?(section_id)
+      self.answers.each do |answer|
+        if answer.question_id.in?(Section.find(section_id).questions.pluck(:id)) && answer.is_common
+          return true
+        end
+      end
+      return false
     end
 
     ##
diff --git a/app/views/branded/phases/_edit_plan_answers_datasets.html.erb b/app/views/branded/phases/_edit_plan_answers_datasets.html.erb
index 12c5f54..ae9b045 100644
--- a/app/views/branded/phases/_edit_plan_answers_datasets.html.erb
+++ b/app/views/branded/phases/_edit_plan_answers_datasets.html.erb
@@ -44,11 +44,12 @@
         <div id="collapse-<%= section.id %>" class="panel-collapse collapse section-content" role="tabpanel" aria-labelledby="heading-<%= section.id %>">
           <div class="panel-body"><!-- accordion body -->
             <ul class="nav nav-tabs">
-              <% common_answers = !section.questions.flat_map(&:answers).select(&:is_common?).empty? %>
+              <% section_has_common_answers = plan.datasets.first.has_common_answers?(section.id) %>
               <% plan.datasets.each_with_index do |dataset, i| %>
-                <li class="datasets_tabs <%= 'active' if dataset.main? %> <%= 'disabled' if common_answers %>">
+                <li class="datasets_tabs <%= 'active' if dataset.main? %> <%= 'disabled' if section_has_common_answers %>">
                   <a href="#section-panel-<%= section.id %>" data-toggle="tab" data-target="#dataset_<%= dataset.id %>_section_<%= section.id %>">
                     <%= dataset.name %>
+                    <%= section_has_common_answers %>
                   </a>
                 </li>
               <% end if plan.datasets.count > 1 %>
@@ -58,7 +59,7 @@
                 <div id="dataset_<%= dataset.id %>_section_<%= section.id %>" class="tab-pane fade <%= 'in active' if dataset.main? %> <%= 'main_dataset' if dataset.main? %>">
                 <% if dataset.main? && plan.datasets.count > 1 %>
                   <p>
-                    <input type="checkbox" class="is_common_cb" <%= 'checked=""' if common_answers %>><%= _('This section\'s answers are common to all datasets') %>
+                    <input type="checkbox" class="is_common_cb" <%= 'checked=""' if section_has_common_answers %>><%= _('This section\'s answers are common to all datasets') %>
                   </p>
                 <% end %>
                 <div class="section-description"><%= sanitize section.description %></div>
diff --git a/app/views/branded/shared/export/_plan.erb b/app/views/branded/shared/export/_plan.erb
index 57a097a..6b3fea4 100644
--- a/app/views/branded/shared/export/_plan.erb
+++ b/app/views/branded/shared/export/_plan.erb
@@ -27,13 +27,15 @@
               <h2><%= section[:title] %></h2>
             <% end %>
             <% @hash[:datasets].each do |dataset| %>
-              <% has_common_answers = dataset.main? && dataset.has_common_answers?(section) %>
-              <% if !has_common_answers %>
+              <% section_has_common_answers = dataset.get_main().has_common_answers?(section[:id]) %>
+              <% if !section_has_common_answers %>
                 <div class="dataset">
                   <h3><%= dataset[:name] %></h3>
               <% end %>
                 <% section[:questions].each do |question| %>
-                  <% answer = @plan.answer(question[:id], false, dataset[:id]) %>
+                  <% answer = section_has_common_answers ? 
+                              @plan.answer(question[:id], false, dataset.get_main().id) : 
+                              @plan.answer(question[:id], false, dataset[:id]) %>
                   <% blank = answer.present? ? answer.is_blank? : true %>
                   <% options = answer.present? ? answer.question_options : [] %>
 
@@ -80,10 +82,10 @@
                   <% end %>
                 <% end %> <!-- questions.each -->
 
-              <% if !has_common_answers %>
+              <% if !section_has_common_answers %>
                 </div> <!-- .dataset -->
               <% end %>
-              <% if has_common_answers %>
+              <% if section_has_common_answers %>
                 <% break %> <!-- break if is dataset has common answers, only display the first -->
               <% end %>
             <% end %><!-- datasets.each -->