diff --git a/src/main/resources/templates/fragments/doc-upload-head.html b/src/main/resources/templates/fragments/doc-upload-head.html
index 42e45da9..428ae199 100644
--- a/src/main/resources/templates/fragments/doc-upload-head.html
+++ b/src/main/resources/templates/fragments/doc-upload-head.html
@@ -2,6 +2,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title th:text="${errorMessages == null ? title : #messages.msg('errors.general-title')}"></title>
+    <script src="/webjars/form-flow/0.0.1/js/honeycrisp.min.js"></script>
     <script>
       (function (h, o, u, n, d) {
         h = h[d] = h[d] || {
@@ -24,7 +25,7 @@
           service: 'il-gcc-front-end',
           env: '[[${@environment.getProperty("DATADOG_ENVIRONMENT")}]]',
           sessionSampleRate: 100,
-          sessionReplaySampleRate: '[[${@environment.getProperty("DATADOG_SESSION_REPLAY_SAMPLE_RATE")}]]',
+          sessionReplaySampleRate: [[${@environment.getProperty("DATADOG_SESSION_REPLAY_SAMPLE_RATE")}]],
           trackUserInteractions: true,
           trackResources: true,
           trackLongTasks: true,
@@ -32,12 +33,8 @@
         });
       })
     </script>
-    <script src="/webjars/form-flow/0.0.1/js/honeycrisp.min.js"></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowDropZone.js"></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowLanguageSelector.js" defer></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowDisableMultipleFormSubmit.js" defer></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowFollowUpQuestion.js" defer></script>
     <th:block th:replace="~{fragments/mixpanelTracking :: mixpanelTracking}"></th:block>
+    <script src="/webjars/form-flow/0.0.1/js/formFlowDropZone.js"></script>
     <link href="/webjars/form-flow/0.0.1/css/honeycrisp.min.css" rel="stylesheet"/>
     <link href="/webjars/form-flow/0.0.1/css/libraryStyles.css" rel="stylesheet"/>
     <link href="/webjars/form-flow/0.0.1/css/customDropzone.css" rel="stylesheet"/>
diff --git a/src/main/resources/templates/fragments/footer.html b/src/main/resources/templates/fragments/footer.html
index 02f16919..66fe382d 100644
--- a/src/main/resources/templates/fragments/footer.html
+++ b/src/main/resources/templates/fragments/footer.html
@@ -17,4 +17,7 @@
       </div>
     </div>
   </div>
+  <script src="/webjars/form-flow/0.0.1/js/formFlowLanguageSelector.js" defer></script>
+  <script src="/webjars/form-flow/0.0.1/js/formFlowDisableMultipleFormSubmit.js" defer></script>
+  <script src="/webjars/form-flow/0.0.1/js/formFlowFollowUpQuestion.js" defer></script>
 </footer>
diff --git a/src/main/resources/templates/fragments/head.html b/src/main/resources/templates/fragments/head.html
index f7ded660..7f5edeb4 100644
--- a/src/main/resources/templates/fragments/head.html
+++ b/src/main/resources/templates/fragments/head.html
@@ -2,6 +2,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title th:text="${errorMessages == null ? title : #messages.msg('errors.general-title')}"></title>
+    <script src="/webjars/form-flow/0.0.1/js/honeycrisp.min.js"></script>
     <script>
         (function (h, o, u, n, d) {
             h = h[d] = h[d] || {
@@ -32,10 +33,6 @@
             });
         })
     </script>
-    <script src="/webjars/form-flow/0.0.1/js/honeycrisp.min.js"></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowLanguageSelector.js" defer></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowDisableMultipleFormSubmit.js" defer></script>
-    <script src="/webjars/form-flow/0.0.1/js/formFlowFollowUpQuestion.js" defer></script>
     <th:block th:replace="~{fragments/mixpanelTracking :: mixpanelTracking}"></th:block>
     <link href="/webjars/form-flow/0.0.1/css/honeycrisp.min.css" rel="stylesheet"/>
     <link href="/webjars/form-flow/0.0.1/css/libraryStyles.css" rel="stylesheet"/>