diff --git a/kibana-reports/public/components/context_menu/context_menu_ui.js b/kibana-reports/public/components/context_menu/context_menu_ui.js
index f2a448be..a61e1976 100644
--- a/kibana-reports/public/components/context_menu/context_menu_ui.js
+++ b/kibana-reports/public/components/context_menu/context_menu_ui.js
@@ -48,7 +48,7 @@ export const popoverMenu = () => {
                     <span class="euiContextMenuItem__text" style="padding-left: 10px; padding-right: 10px; margin-top: 10px; box-decoration-break: clone; display: inline-block;">
                       Files can take a minute or two 
                       to generate depending on the 
-                      size of your dashboard
+                      size of your source data
                     </span>
                    </div>
                    <div>
diff --git a/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx b/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
index cd45442e..beac8ec0 100644
--- a/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
+++ b/kibana-reports/public/components/main/report_definition_details/report_definition_details.tsx
@@ -336,10 +336,10 @@ export function ReportDefinitionDetails(props) {
       // TODO: need better display
       timePeriod: moment.duration(timeDuration).humanize(),
       fileFormat: reportFormat,
-      reportHeader: reportParams.core_params.hasOwnProperty('header')
+      reportHeader: reportParams.core_params.hasOwnProperty('header') && reportParams.core_params.header != ""
         ? converter.makeMarkdown(reportParams.core_params.header)
         : `\u2014`,
-      reportFooter: reportParams.core_params.hasOwnProperty('footer')
+      reportFooter: reportParams.core_params.hasOwnProperty('footer') && reportParams.core_params.footer != ""
         ? converter.makeMarkdown(reportParams.core_params.footer)
         : `\u2014`,
       triggerType: triggerType,
diff --git a/kibana-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap b/kibana-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap
index 633d5ffa..e46cc598 100644
--- a/kibana-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap
+++ b/kibana-reports/public/components/main/report_details/__tests__/__snapshots__/report_details.test.tsx.snap
@@ -248,7 +248,11 @@ exports[`<ReportDetails /> panel render 5 hours recurring component 1`] = `
             </dt>
             <dd
               class="euiDescriptionList__description"
-            />
+            >
+              <p>
+                —
+              </p>
+            </dd>
           </dl>
         </div>
         <div
@@ -264,7 +268,11 @@ exports[`<ReportDetails /> panel render 5 hours recurring component 1`] = `
             </dt>
             <dd
               class="euiDescriptionList__description"
-            />
+            >
+              <p>
+                —
+              </p>
+            </dd>
           </dl>
         </div>
         <div
@@ -636,7 +644,11 @@ exports[`<ReportDetails /> panel render on-demand component 1`] = `
             </dt>
             <dd
               class="euiDescriptionList__description"
-            />
+            >
+              <p>
+                —
+              </p>
+            </dd>
           </dl>
         </div>
         <div
@@ -652,7 +664,11 @@ exports[`<ReportDetails /> panel render on-demand component 1`] = `
             </dt>
             <dd
               class="euiDescriptionList__description"
-            />
+            >
+              <p>
+                —
+              </p>
+            </dd>
           </dl>
         </div>
         <div
diff --git a/kibana-reports/public/components/main/report_details/report_details.tsx b/kibana-reports/public/components/main/report_details/report_details.tsx
index dae18791..3f597988 100644
--- a/kibana-reports/public/components/main/report_details/report_details.tsx
+++ b/kibana-reports/public/components/main/report_details/report_details.tsx
@@ -187,10 +187,10 @@ export function ReportDetails(props) {
       time_period: parseTimePeriod(queryUrl),
       defaultFileFormat: coreParams.report_format,
       state: state,
-      reportHeader: reportParams.core_params.hasOwnProperty('header')
+      reportHeader: reportParams.core_params.hasOwnProperty('header') && reportParams.core_params.header != ""
         ? converter.makeMarkdown(reportParams.core_params.header)
         : `\u2014`,
-      reportFooter: reportParams.core_params.hasOwnProperty('footer')
+      reportFooter: reportParams.core_params.hasOwnProperty('footer') && reportParams.core_params.footer != ""
         ? converter.makeMarkdown(reportParams.core_params.footer)
         : `\u2014`,
       triggerType: triggerType,
diff --git a/kibana-reports/public/components/report_definitions/report_trigger/report_trigger.tsx b/kibana-reports/public/components/report_definitions/report_trigger/report_trigger.tsx
index 91faf228..9ceede60 100644
--- a/kibana-reports/public/components/report_definitions/report_trigger/report_trigger.tsx
+++ b/kibana-reports/public/components/report_definitions/report_trigger/report_trigger.tsx
@@ -479,7 +479,7 @@ export function ReportTrigger(props: ReportTriggerProps) {
           error={'Invalid cron expression.'}
           labelAppend={
             <EuiText size="xs">
-              <EuiLink href="https://opendistro.github.io/for-elasticsearch-docs/docs/alerting/cron/">
+              <EuiLink href="https://opendistro.github.io/for-elasticsearch-docs/docs/alerting/cron/" target="_blank">
                 Cron help
               </EuiLink>
             </EuiText>