diff --git a/app/views/shared/export/_plan.erb b/app/views/shared/export/_plan.erb
index 8c05506..6410732 100644
--- a/app/views/shared/export/_plan.erb
+++ b/app/views/shared/export/_plan.erb
@@ -38,21 +38,24 @@
<% phase[:sections].each do |section| %>
<% if @show_sections_questions %>
- <%= section[:title] %>
+ <%= section[:title] %>
<% end %>
<% section[:questions].each do |question| %>
- <% if @show_sections_questions && !@public_plan %>
-
<%= raw question[:text].gsub(/
(\s|| |<\/td>| )*(<\/tr>| |
)/,"") if question[:text].present?%>
-
- <% end %>
<% answer = @plan.answer(question[:id], false) %>
<% blank = answer.present? ? answer.is_blank? : true %>
<% options = answer.present? ? answer.question_options : [] %>
+
+ <% if @show_sections_questions && !@public_plan %>
+ <% if question[:text].present?%>
+ <%= raw question[:text].gsub(/(\s|| |<\/td>| )*(<\/tr>| |
)/,"") unless @show_unanswered == false && blank %>
+ <% end %>
+ <% end %>
<%# case where question has not been answered sufficiently to display%>
<% if @show_unanswered && (answer.blank? || (options.blank? && blank))%>
<%= _('Question not answered.') -%>
+
<% else %>
<%# case where Question has options %>
<% if options.present?%>
@@ -77,6 +80,7 @@
<% elsif !blank %>
<%= raw answer.text %>
<% end %>
+
<% end %>
<% end %>