diff --git a/app/models/exported_plan.rb b/app/models/exported_plan.rb
index e4c03ea..7e51188 100644
--- a/app/models/exported_plan.rb
+++ b/app/models/exported_plan.rb
@@ -80,9 +80,8 @@
   end
 
   def sections
-    phase_id = self.phase_id ||= self.plan.template.phases.first.id # Use the first phase if none was specified
-    sections = Phase.find(phase_id).sections
-    sections.sort_by(&:number)
+    self.phase_id ||= self.plan.template.phases.first.id
+    Section.where({phase_id: phase_id}).order(:number)
   end
 
   def questions_for_section(section_id)
@@ -167,7 +166,7 @@
   end
 
 private
-
+  # Returns an Array of question_ids for the exported settings stored for a plan
   def questions
     question_settings = self.settings(:export).fields[:questions]
     @questions ||= if question_settings.present?
diff --git a/app/views/plans/export.html.erb b/app/views/plans/export.html.erb
index 6f51388..27a6b1b 100644
--- a/app/views/plans/export.html.erb
+++ b/app/views/plans/export.html.erb
@@ -29,24 +29,25 @@
 				</table>
       		 <% end %>
 			<% @exported_plan.sections.each do |section| %>
-				<h3><%= section.title %></h3>
-				<table class="dmp_table">
-					<thead>
-					    <tr>
-					      	<th class="dmp_th_medium"><%= _('Questions')%></th>
-					      	<th class="dmp_th_big"><%= _('Answers')%></th>
-	   					</tr>
-   					</thead>
-   					<tbody>
-						<% questions = @exported_plan.questions_for_section(section.id) %>
-						<% questions.each do |question| %>
+			<% questions = @exported_plan.questions_for_section(section.id)
+				if questions.present? %>
+				   	<h3><%= section.title %></h3>
+				   	<table class="dmp_table">
+						<thead>
+					    	<tr>
+					      		<th class="dmp_th_medium"><%= _('Questions')%></th>
+					      		<th class="dmp_th_big"><%= _('Answers')%></th>
+	   						</tr>
+   						</thead>
+   						<tbody>
+   							<% questions.each do |question| %>
 							<tr>
 								<th class="dmp_th_border" >
 									<p>- <%= raw question.text %></p>
 								</th>
 	        					<td class="dmp_td_border" >	
 									<% answer = @plan.answer(question.id, false) %>
-									<% if answer.nil? then %>
+									<% if answer.nil? %>
 										<p><%= _('Question not answered') %></p>
 									<% else %>
                                         <% q_format = question.question_format %>
@@ -56,19 +57,20 @@
 													<li><%= option.text %></li>
 												<% end %>
 											</ul>
-                                            <% if question.option_comment_display == true then%>
+                                            <% if question.option_comment_display == true %>
                                                 <%= raw answer.text %>
                                             <% end %>
-										<%else%>
+										<% else%>
                                             <%= raw answer.text %>
-                                        <%end%>
+                                        <% end%>
 									<% end %>	
 								</td>
 							</tr>
 						<% end %>
-					</tbody>	
-				</table>			
-			<% end %>
+   						</tbody>
+   					</table>
+			 <% end %> <!-- end if question.present? -->
+			<% end %> <!-- end @exported_plan.sections.each -->
 		</div>	
 	</div>	
 </div>