@hmcts/ccd-case-ui-toolkit 6.16.0-query-management-minor-defects-v2 → 6.16.0-query-management-read-view-changes-v4

package/bundles/hmcts-ccd-case-ui-toolkit.umd.js

@@ -20408,6 +20408,12 @@
         RaiseQueryErrorMessage["RESPOND_QUERY_BODY"] = "Add a response before continue";
     })(exports.RaiseQueryErrorMessage || (exports.RaiseQueryErrorMessage = {}));
 
+    exports.QueryItemResponseStatus = void 0;
+    (function (QueryItemResponseStatus) {
+        QueryItemResponseStatus["NEW"] = "New";
+        QueryItemResponseStatus["RESPONDED"] = "Responded";
+    })(exports.QueryItemResponseStatus || (exports.QueryItemResponseStatus = {}));
+
     exports.RespondToQueryErrorMessages = void 0;
     (function (RespondToQueryErrorMessages) {
         RespondToQueryErrorMessages["FULL_NAME"] = "Enter a full name";
@@ -20440,26 +20446,39 @@
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(6, 4, ctx_r1.qualifyingQuestionsErrorMessage.SELECT_AN_OPTION), " ");
         }
     }
-    function QualifyingQuestionOptionsComponent_ng_container_0_div_9_Template(rf, ctx) {
+    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_ng_container_1_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "div", 9);
-            i0__namespace.ɵɵelement(1, "input", 10);
-            i0__namespace.ɵɵelementStart(2, "label", 11);
-            i0__namespace.ɵɵtext(3);
-            i0__namespace.ɵɵpipe(4, "rpxTranslate");
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵelement(1, "hr");
+            i0__namespace.ɵɵelementContainerEnd();
+        }
+    }
+    function QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_Template(rf, ctx) {
+        if (rf & 1) {
+            i0__namespace.ɵɵelementContainerStart(0);
+            i0__namespace.ɵɵtemplate(1, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_ng_container_1_Template, 2, 0, "ng-container", 0);
+            i0__namespace.ɵɵelementStart(2, "div", 9);
+            i0__namespace.ɵɵelement(3, "input", 10);
+            i0__namespace.ɵɵelementStart(4, "label", 11);
+            i0__namespace.ɵɵtext(5);
+            i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
+            i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
             var qualifyingQuestion_r3 = ctx.$implicit;
+            var isLast_r4 = ctx.last;
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵproperty("ngIf", isLast_r4);
+            i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵpropertyInterpolate("id", qualifyingQuestion_r3.name);
             i0__namespace.ɵɵproperty("formControl", ctx_r2.qualifyingQuestionsControl)("value", qualifyingQuestion_r3);
             i0__namespace.ɵɵadvance(1);
             i0__namespace.ɵɵproperty("for", qualifyingQuestion_r3.name);
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 5, qualifyingQuestion_r3.name));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(6, 6, qualifyingQuestion_r3.name));
         }
     }
     function QualifyingQuestionOptionsComponent_ng_container_0_Template(rf, ctx) {
@@ -20475,7 +20494,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵtemplate(7, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_7_Template, 7, 6, "ng-container", 0);
             i0__namespace.ɵɵelementStart(8, "div", 5);
-            i0__namespace.ɵɵtemplate(9, QualifyingQuestionOptionsComponent_ng_container_0_div_9_Template, 5, 7, "div", 6);
+            i0__namespace.ɵɵtemplate(9, QualifyingQuestionOptionsComponent_ng_container_0_ng_container_9_Template, 7, 8, "ng-container", 6);
             i0__namespace.ɵɵpipe(10, "async");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -20508,7 +20527,7 @@
         return QualifyingQuestionOptionsComponent;
     }());
     QualifyingQuestionOptionsComponent.ɵfac = function QualifyingQuestionOptionsComponent_Factory(t) { return new (t || QualifyingQuestionOptionsComponent)(); };
-    QualifyingQuestionOptionsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QualifyingQuestionOptionsComponent, selectors: [["ccd-qualifying-question-options"]], inputs: { qualifyingQuestionsControl: "qualifyingQuestionsControl", qualifyingQuestions$: "qualifyingQuestions$" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-form-group"], [1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--l"], [1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios"], ["class", "govuk-radios__item", 4, "ngFor", "ngForOf"], [1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["name", "qualifyingQuestionOption", "type", "radio", 1, "govuk-radios__input", 3, "id", "formControl", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"]], template: function QualifyingQuestionOptionsComponent_Template(rf, ctx) {
+    QualifyingQuestionOptionsComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QualifyingQuestionOptionsComponent, selectors: [["ccd-qualifying-question-options"]], inputs: { qualifyingQuestionsControl: "qualifyingQuestionsControl", qualifyingQuestions$: "qualifyingQuestions$" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-form-group"], [1, "govuk-fieldset"], [1, "govuk-fieldset__legend", "govuk-fieldset__legend--l"], [1, "govuk-fieldset__heading"], ["data-module", "govuk-radios", 1, "govuk-radios"], [4, "ngFor", "ngForOf"], [1, "govuk-error-message"], [1, "govuk-visually-hidden"], [1, "govuk-radios__item"], ["name", "qualifyingQuestionOption", "type", "radio", 1, "govuk-radios__input", 3, "id", "formControl", "value"], [1, "govuk-label", "govuk-radios__label", 3, "for"]], template: function QualifyingQuestionOptionsComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, QualifyingQuestionOptionsComponent_ng_container_0_Template, 11, 9, "ng-container", 0);
             }
@@ -20666,6 +20685,14 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(QueryListItem.prototype, "responseStatus", {
+            get: function () {
+                var _a;
+                return ((_a = this.children) === null || _a === void 0 ? void 0 : _a.length) > 0 ? exports.QueryItemResponseStatus.RESPONDED : exports.QueryItemResponseStatus.NEW;
+            },
+            enumerable: false,
+            configurable: true
+        });
         return QueryListItem;
     }());
 
@@ -20749,46 +20776,14 @@
         }
         if (rf & 2) {
             var ctx_r4 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 2, "Submitted query"), " ");
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", ctx_r4.queryItem.subject, " ");
-        }
-    }
-    function QueryCheckYourAnswersComponent_dl_21_Template(rf, ctx) {
-        if (rf & 1) {
-            var _r9_1 = i0__namespace.ɵɵgetCurrentView();
-            i0__namespace.ɵɵelementStart(0, "dl", 8);
-            i0__namespace.ɵɵelementStart(1, "div", 9);
-            i0__namespace.ɵɵelementStart(2, "dt", 10);
-            i0__namespace.ɵɵtext(3);
-            i0__namespace.ɵɵpipe(4, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(5, "dd", 11);
-            i0__namespace.ɵɵtext(6);
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(7, "dd", 12);
-            i0__namespace.ɵɵelementStart(8, "a", 13);
-            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r9_1); var ctx_r8 = i0__namespace.ɵɵnextContext(); return ctx_r8.goBack(); });
-            i0__namespace.ɵɵtext(9);
-            i0__namespace.ɵɵpipe(10, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r5 = i0__namespace.ɵɵnextContext();
             var tmp_1_0 = null;
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 3, "Query subject"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 2, "Query subject"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", (tmp_1_0 = ctx_r5.formGroup.get("subject")) == null ? null : tmp_1_0.value, " ");
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 5, "Change"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", (tmp_1_0 = ctx_r4.formGroup.get("subject")) == null ? null : tmp_1_0.value, " ");
         }
     }
-    function QueryCheckYourAnswersComponent_dl_33_ng_container_6_Template(rf, ctx) {
+    function QueryCheckYourAnswersComponent_dl_21_ng_container_6_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
             i0__namespace.ɵɵtext(1);
@@ -20800,7 +20795,7 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(2, 1, "Is the query hearing related?", null, "Yes"), " ");
         }
     }
-    function QueryCheckYourAnswersComponent_dl_33_ng_template_7_Template(rf, ctx) {
+    function QueryCheckYourAnswersComponent_dl_21_ng_template_7_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵtext(0);
             i0__namespace.ɵɵpipe(1, "rpxTranslate");
@@ -20809,9 +20804,9 @@
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(1, 1, "Is the query hearing related?", null, "No"), " ");
         }
     }
-    function QueryCheckYourAnswersComponent_dl_33_div_13_Template(rf, ctx) {
+    function QueryCheckYourAnswersComponent_dl_21_div_13_Template(rf, ctx) {
         if (rf & 1) {
-            var _r15_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r12_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "div", 9);
             i0__namespace.ɵɵelementStart(1, "dt", 10);
             i0__namespace.ɵɵtext(2);
@@ -20823,7 +20818,7 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(7, "dd", 12);
             i0__namespace.ɵɵelementStart(8, "a", 13);
-            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_33_div_13_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r15_1); var ctx_r14 = i0__namespace.ɵɵnextContext(2); return ctx_r14.goBack(); });
+            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_div_13_Template_a_click_8_listener() { i0__namespace.ɵɵrestoreView(_r12_1); var ctx_r11 = i0__namespace.ɵɵnextContext(2); return ctx_r11.goBack(); });
             i0__namespace.ɵɵtext(9);
             i0__namespace.ɵɵpipe(10, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -20831,19 +20826,19 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r13 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r10 = i0__namespace.ɵɵnextContext(2);
             var tmp_1_0 = null;
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 3, "What is the date of the hearing your query is related to?"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(6, 5, (tmp_1_0 = ctx_r13.formGroup.get("hearingDate")) == null ? null : tmp_1_0.value, "dd MMM yyyy"), " ");
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind2(6, 5, (tmp_1_0 = ctx_r10.formGroup.get("hearingDate")) == null ? null : tmp_1_0.value, "dd MMM yyyy"), " ");
             i0__namespace.ɵɵadvance(4);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(10, 8, "Change"), " ");
         }
     }
-    function QueryCheckYourAnswersComponent_dl_33_Template(rf, ctx) {
+    function QueryCheckYourAnswersComponent_dl_21_Template(rf, ctx) {
         if (rf & 1) {
-            var _r17_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r14_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "dl", 8);
             i0__namespace.ɵɵelementStart(1, "div", 9);
             i0__namespace.ɵɵelementStart(2, "dt", 10);
@@ -20851,42 +20846,42 @@
             i0__namespace.ɵɵpipe(4, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(5, "dd", 11);
-            i0__namespace.ɵɵtemplate(6, QueryCheckYourAnswersComponent_dl_33_ng_container_6_Template, 3, 5, "ng-container", 4);
-            i0__namespace.ɵɵtemplate(7, QueryCheckYourAnswersComponent_dl_33_ng_template_7_Template, 2, 5, "ng-template", null, 19, i0__namespace.ɵɵtemplateRefExtractor);
+            i0__namespace.ɵɵtemplate(6, QueryCheckYourAnswersComponent_dl_21_ng_container_6_Template, 3, 5, "ng-container", 4);
+            i0__namespace.ɵɵtemplate(7, QueryCheckYourAnswersComponent_dl_21_ng_template_7_Template, 2, 5, "ng-template", null, 19, i0__namespace.ɵɵtemplateRefExtractor);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(9, "dd", 12);
             i0__namespace.ɵɵelementStart(10, "a", 13);
-            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_33_Template_a_click_10_listener() { i0__namespace.ɵɵrestoreView(_r17_1); var ctx_r16 = i0__namespace.ɵɵnextContext(); return ctx_r16.goBack(); });
+            i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_dl_21_Template_a_click_10_listener() { i0__namespace.ɵɵrestoreView(_r14_1); var ctx_r13 = i0__namespace.ɵɵnextContext(); return ctx_r13.goBack(); });
             i0__namespace.ɵɵtext(11);
             i0__namespace.ɵɵpipe(12, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(13, QueryCheckYourAnswersComponent_dl_33_div_13_Template, 11, 10, "div", 20);
+            i0__namespace.ɵɵtemplate(13, QueryCheckYourAnswersComponent_dl_21_div_13_Template, 11, 10, "div", 20);
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var _r11 = i0__namespace.ɵɵreference(8);
-            var ctx_r6 = i0__namespace.ɵɵnextContext();
+            var _r8 = i0__namespace.ɵɵreference(8);
+            var ctx_r5 = i0__namespace.ɵɵnextContext();
             var tmp_1_0 = null;
             var tmp_4_0 = null;
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(4, 5, "Is the query hearing related?"), " ");
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵproperty("ngIf", ((tmp_1_0 = ctx_r6.formGroup.get("isHearingRelated")) == null ? null : tmp_1_0.value) === true)("ngIfElse", _r11);
+            i0__namespace.ɵɵproperty("ngIf", ((tmp_1_0 = ctx_r5.formGroup.get("isHearingRelated")) == null ? null : tmp_1_0.value) === true)("ngIfElse", _r8);
             i0__namespace.ɵɵadvance(5);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(12, 7, "Change"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", (tmp_4_0 = ctx_r6.formGroup.get("isHearingRelated")) == null ? null : tmp_4_0.value);
+            i0__namespace.ɵɵproperty("ngIf", (tmp_4_0 = ctx_r5.formGroup.get("isHearingRelated")) == null ? null : tmp_4_0.value);
         }
     }
-    function QueryCheckYourAnswersComponent_ccd_query_attachments_read_40_Template(rf, ctx) {
+    function QueryCheckYourAnswersComponent_ccd_query_attachments_read_28_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 21);
         }
         if (rf & 2) {
-            var ctx_r7 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵproperty("attachments", ctx_r7.formGroup.get("attachments").value);
+            var ctx_r6 = i0__namespace.ɵɵnextContext();
+            i0__namespace.ɵɵproperty("attachments", ctx_r6.formGroup.get("attachments").value);
         }
     }
     var QueryCheckYourAnswersComponent = /** @class */ (function () {
@@ -20900,7 +20895,7 @@
         return QueryCheckYourAnswersComponent;
     }());
     QueryCheckYourAnswersComponent.ɵfac = function QueryCheckYourAnswersComponent_Factory(t) { return new (t || QueryCheckYourAnswersComponent)(); };
-    QueryCheckYourAnswersComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCheckYourAnswersComponent, selectors: [["ccd-query-check-your-answers"]], inputs: { formGroup: "formGroup", queryItem: "queryItem", queryCreateContext: "queryCreateContext" }, outputs: { backClicked: "backClicked" }, decls: 53, vars: 33, consts: [[1, "govuk-grid-row"], [1, "govuk-grid-column-two-thirds-from-desktop"], [4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfElse"], ["defaultCheckYourAnswersTitle", ""], [1, "govuk-!-margin-bottom-4"], ["class", "govuk-summary-list govuk-!-margin-bottom-0", 4, "ngIf"], [1, "govuk-summary-list", "govuk-!-margin-bottom-0"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key"], [1, "govuk-summary-list__value"], [1, "govuk-summary-list__actions"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-summary-list__value", "govuk-summary-list__value--documentAttached"], [3, "attachments", 4, "ngIf"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", "govuk-!-margin-right-3", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button"], [1, "govuk-caption-l"], ["isHearingRelatedFalse", ""], ["class", "govuk-summary-list__row", 4, "ngIf"], [3, "attachments"]], template: function QueryCheckYourAnswersComponent_Template(rf, ctx) {
+    QueryCheckYourAnswersComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryCheckYourAnswersComponent, selectors: [["ccd-query-check-your-answers"]], inputs: { formGroup: "formGroup", queryItem: "queryItem", queryCreateContext: "queryCreateContext" }, outputs: { backClicked: "backClicked" }, decls: 41, vars: 25, consts: [[1, "govuk-grid-row"], [1, "govuk-grid-column-two-thirds-from-desktop"], [4, "ngIf"], [1, "govuk-heading-l"], [4, "ngIf", "ngIfElse"], ["defaultCheckYourAnswersTitle", ""], [1, "govuk-!-margin-bottom-4"], ["class", "govuk-summary-list govuk-!-margin-bottom-0", 4, "ngIf"], [1, "govuk-summary-list", "govuk-!-margin-bottom-0"], [1, "govuk-summary-list__row"], [1, "govuk-summary-list__key"], [1, "govuk-summary-list__value"], [1, "govuk-summary-list__actions"], ["href", "javascript:void(0)", 1, "govuk-link", 3, "click"], [1, "govuk-summary-list__value", "govuk-summary-list__value--documentAttached"], [3, "attachments", 4, "ngIf"], ["data-module", "govuk-button", 1, "govuk-button", "govuk-button--secondary", "govuk-!-margin-right-3", 3, "click"], ["data-module", "govuk-button", 1, "govuk-button"], [1, "govuk-caption-l"], ["isHearingRelatedFalse", ""], ["class", "govuk-summary-list__row", 4, "ngIf"], [3, "attachments"]], template: function QueryCheckYourAnswersComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "div", 1);
@@ -20931,15 +20926,15 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(21, QueryCheckYourAnswersComponent_dl_21_Template, 11, 7, "dl", 7);
+                i0__namespace.ɵɵtemplate(21, QueryCheckYourAnswersComponent_dl_21_Template, 14, 9, "dl", 7);
                 i0__namespace.ɵɵelementStart(22, "dl", 8);
                 i0__namespace.ɵɵelementStart(23, "div", 9);
                 i0__namespace.ɵɵelementStart(24, "dt", 10);
                 i0__namespace.ɵɵtext(25);
                 i0__namespace.ɵɵpipe(26, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(27, "dd", 11);
-                i0__namespace.ɵɵtext(28);
+                i0__namespace.ɵɵelementStart(27, "dd", 14);
+                i0__namespace.ɵɵtemplate(28, QueryCheckYourAnswersComponent_ccd_query_attachments_read_28_Template, 1, 1, "ccd-query-attachments-read", 15);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementStart(29, "dd", 12);
                 i0__namespace.ɵɵelementStart(30, "a", 13);
@@ -20950,35 +20945,16 @@
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(33, QueryCheckYourAnswersComponent_dl_33_Template, 14, 9, "dl", 7);
-                i0__namespace.ɵɵelementStart(34, "dl", 8);
-                i0__namespace.ɵɵelementStart(35, "div", 9);
-                i0__namespace.ɵɵelementStart(36, "dt", 10);
-                i0__namespace.ɵɵtext(37);
-                i0__namespace.ɵɵpipe(38, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(39, "dd", 14);
-                i0__namespace.ɵɵtemplate(40, QueryCheckYourAnswersComponent_ccd_query_attachments_read_40_Template, 1, 1, "ccd-query-attachments-read", 15);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(41, "dd", 12);
-                i0__namespace.ɵɵelementStart(42, "a", 13);
-                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_a_click_42_listener() { return ctx.goBack(); });
-                i0__namespace.ɵɵtext(43);
-                i0__namespace.ɵɵpipe(44, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelement(33, "br");
+                i0__namespace.ɵɵelementStart(34, "div");
+                i0__namespace.ɵɵelementStart(35, "button", 16);
+                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_button_click_35_listener() { return ctx.goBack(); });
+                i0__namespace.ɵɵtext(36);
+                i0__namespace.ɵɵpipe(37, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelement(45, "br");
-                i0__namespace.ɵɵelementStart(46, "div");
-                i0__namespace.ɵɵelementStart(47, "button", 16);
-                i0__namespace.ɵɵlistener("click", function QueryCheckYourAnswersComponent_Template_button_click_47_listener() { return ctx.goBack(); });
-                i0__namespace.ɵɵtext(48);
-                i0__namespace.ɵɵpipe(49, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(50, "button", 17);
-                i0__namespace.ɵɵtext(51);
-                i0__namespace.ɵɵpipe(52, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(38, "button", 17);
+                i0__namespace.ɵɵtext(39);
+                i0__namespace.ɵɵpipe(40, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -20987,39 +20963,30 @@
             if (rf & 2) {
                 var _r2 = i0__namespace.ɵɵreference(6);
                 var tmp_5_0 = null;
-                var tmp_9_0 = null;
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.NEW_QUERY);
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND)("ngIfElse", _r2);
                 i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND);
-                i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(14, 17, "Full name"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", (tmp_5_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_5_0.value, " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(20, 19, "Change"), " ");
-                i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.NEW_QUERY);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(26, 21, "Query body"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(14, 13, "Query body"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", (tmp_9_0 = ctx.formGroup.get("body")) == null ? null : tmp_9_0.value, " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", (tmp_5_0 = ctx.formGroup.get("body")) == null ? null : tmp_5_0.value, " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(32, 23, "Change"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(20, 15, "Change"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryCreateContext === ctx.queryCreateContextEnum.NEW_QUERY);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(38, 25, "Document attached"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(26, 17, "Document attached"), " ");
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("ngIf", ctx.formGroup.get("attachments").value);
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(44, 27, "Change"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(32, 19, "Change"), " ");
                 i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(49, 29, "Previous"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(37, 21, "Previous"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(52, 31, "Submit"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(40, 23, "Submit"), " ");
             }
         }, styles: [".govuk-summary-list__value--documentAttached[_ngcontent-%COMP%]{vertical-align:middle}"] });
     (function () {
@@ -21041,9 +21008,9 @@
                 }] });
     })();
 
-    function QueryDetailsTableComponent_ng_container_0_tr_35_Template(rf, ctx) {
+    function QueryDetailsTableComponent_ng_container_0_tr_36_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "tr", 3);
+            i0__namespace.ɵɵelementStart(0, "tr", 8);
             i0__namespace.ɵɵelementStart(1, "th", 4);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
@@ -21057,14 +21024,14 @@
         if (rf & 2) {
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "What is the date of the hearing your query related to?"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(3, 2, "What is the date of the hearing?"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(6, 4, ctx_r1.queryItem.hearingDate, "dd MMM yyyy"));
         }
     }
-    function QueryDetailsTableComponent_ng_container_0_ccd_query_attachments_read_41_Template(rf, ctx) {
+    function QueryDetailsTableComponent_ng_container_0_ccd_query_attachments_read_42_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 8);
+            i0__namespace.ɵɵelement(0, "ccd-query-attachments-read", 9);
         }
         if (rf & 2) {
             var ctx_r2 = i0__namespace.ɵɵnextContext(2);
@@ -21121,16 +21088,17 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(33, "td", 5);
             i0__namespace.ɵɵtext(34);
+            i0__namespace.ɵɵpipe(35, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(35, QueryDetailsTableComponent_ng_container_0_tr_35_Template, 7, 7, "tr", 6);
-            i0__namespace.ɵɵelementStart(36, "tr", 3);
-            i0__namespace.ɵɵelementStart(37, "th", 4);
-            i0__namespace.ɵɵtext(38);
-            i0__namespace.ɵɵpipe(39, "rpxTranslate");
+            i0__namespace.ɵɵtemplate(36, QueryDetailsTableComponent_ng_container_0_tr_36_Template, 7, 7, "tr", 6);
+            i0__namespace.ɵɵelementStart(37, "tr", 3);
+            i0__namespace.ɵɵelementStart(38, "th", 4);
+            i0__namespace.ɵɵtext(39);
+            i0__namespace.ɵɵpipe(40, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵelementStart(40, "td", 5);
-            i0__namespace.ɵɵtemplate(41, QueryDetailsTableComponent_ng_container_0_ccd_query_attachments_read_41_Template, 1, 1, "ccd-query-attachments-read", 7);
+            i0__namespace.ɵɵelementStart(41, "td", 5);
+            i0__namespace.ɵɵtemplate(42, QueryDetailsTableComponent_ng_container_0_ccd_query_attachments_read_42_Template, 1, 1, "ccd-query-attachments-read", 7);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -21140,31 +21108,35 @@
         if (rf & 2) {
             var ctx_r0 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(2, 14, "Details of the query"));
+            i0__namespace.ɵɵattribute("aria-describedby", i0__namespace.ɵɵpipeBind1(2, 18, "Details of the query"));
             i0__namespace.ɵɵadvance(5);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 16, "Last submitted by"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 20, "Last submitted by"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.lastSubmittedBy);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(13, 18, "Submission date"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(13, 22, "Submission date"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(16, 20, ctx_r0.queryItem.createdOn, "dd MMM yyyy"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(16, 24, ctx_r0.queryItem.createdOn, "dd MMM yyyy"));
             i0__namespace.ɵɵadvance(4);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(20, 23, "Query subject"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(20, 27, "Query subject"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.subject);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(26, 25, "Query body"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(26, 29, "Query body"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.body);
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(32, 27, "Is the query hearing related?"));
-            i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(ctx_r0.queryItem.isHearingRelated ? "Yes" : "No");
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵclassProp("govuk-table__header--no-border", ctx_r0.queryItem.isHearingRelated);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(32, 31, "Is the query hearing related?"), " ");
+            i0__namespace.ɵɵadvance(2);
+            i0__namespace.ɵɵclassProp("govuk-table__cell--no-border", ctx_r0.queryItem.isHearingRelated);
             i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(35, 33, "Is the query hearing related?", null, ctx_r0.queryItem.isHearingRelated ? "Yes" : "No"), "");
+            i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.queryItem.isHearingRelated);
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(39, 29, "Attachments"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(40, 37, "Attachments"));
             i0__namespace.ɵɵadvance(3);
             i0__namespace.ɵɵproperty("ngIf", ctx_r0.queryItem.attachments);
         }
@@ -21175,14 +21147,14 @@
         return QueryDetailsTableComponent;
     }());
     QueryDetailsTableComponent.ɵfac = function QueryDetailsTableComponent_Factory(t) { return new (t || QueryDetailsTableComponent)(); };
-    QueryDetailsTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsTableComponent, selectors: [["ccd-query-details-table"]], inputs: { queryItem: "queryItem" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row", 4, "ngIf"], [3, "attachments", 4, "ngIf"], [3, "attachments"]], template: function QueryDetailsTableComponent_Template(rf, ctx) {
+    QueryDetailsTableComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryDetailsTableComponent, selectors: [["ccd-query-details-table"]], inputs: { queryItem: "queryItem" }, decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-details-table"], [1, "govuk-table__body"], [1, "govuk-table__row"], ["scope", "row", 1, "govuk-table__header"], [1, "govuk-table__cell"], ["class", "govuk-table__row govuk-table__row--isHearingRelated", 4, "ngIf"], [3, "attachments", 4, "ngIf"], [1, "govuk-table__row", "govuk-table__row--isHearingRelated"], [3, "attachments"]], template: function QueryDetailsTableComponent_Template(rf, ctx) {
             if (rf & 1) {
-                i0__namespace.ɵɵtemplate(0, QueryDetailsTableComponent_ng_container_0_Template, 42, 31, "ng-container", 0);
+                i0__namespace.ɵɵtemplate(0, QueryDetailsTableComponent_ng_container_0_Template, 43, 39, "ng-container", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryItem);
             }
-        }, styles: [".query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}"] });
+        }, styles: [".query-details-table[_ngcontent-%COMP%]   .govuk-table__header[_ngcontent-%COMP%]{width:330px}.query-details-table[_ngcontent-%COMP%]   .collection-field-table[_ngcontent-%COMP%]   tr[_ngcontent-%COMP%] > td[_ngcontent-%COMP%]{border-bottom:none}.query-details-table[_ngcontent-%COMP%]   .govuk-table__cell--no-border[_ngcontent-%COMP%], .query-details-table[_ngcontent-%COMP%]   .govuk-table__header--no-border[_ngcontent-%COMP%]{border-bottom:0}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryDetailsTableComponent, [{
                 type: i0.Component,
@@ -21449,31 +21421,33 @@
 
     function QueryListComponent_ng_container_0_th_7_Template(rf, ctx) {
         if (rf & 1) {
-            var _r5_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r6_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "th", 8);
-            i0__namespace.ɵɵtext(1);
-            i0__namespace.ɵɵpipe(2, "rpxTranslate");
-            i0__namespace.ɵɵelementStart(3, "a", 9);
-            i0__namespace.ɵɵlistener("click", function QueryListComponent_ng_container_0_th_7_Template_a_click_3_listener() { i0__namespace.ɵɵrestoreView(_r5_1); var col_r3 = ctx.$implicit; var ctx_r4 = i0__namespace.ɵɵnextContext(2); return ctx_r4.sortTable(col_r3); });
+            i0__namespace.ɵɵelementStart(1, "button", 9);
+            i0__namespace.ɵɵlistener("click", function QueryListComponent_ng_container_0_th_7_Template_button_click_1_listener() { i0__namespace.ɵɵrestoreView(_r6_1); var col_r3 = ctx.$implicit; var ctx_r5 = i0__namespace.ɵɵnextContext(2); return ctx_r5.sortTable(col_r3); });
+            i0__namespace.ɵɵtext(2);
+            i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
             var col_r3 = ctx.$implicit;
+            var i_r4 = ctx.index;
             var ctx_r1 = i0__namespace.ɵɵnextContext(2);
+            i0__namespace.ɵɵattribute("aria-sort", ctx_r1.getAriaSortHeaderValue(col_r3));
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(2, 2, col_r3.displayName), " ");
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("innerHTML", ctx_r1.sortWidget(col_r3), i0__namespace.ɵɵsanitizeHtml);
+            i0__namespace.ɵɵattribute("data-index", i_r4);
+            i0__namespace.ɵɵadvance(1);
+            i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 3, col_r3.displayName), " ");
         }
     }
     function QueryListComponent_ng_container_0_tr_9_Template(rf, ctx) {
         if (rf & 1) {
-            var _r8_1 = i0__namespace.ɵɵgetCurrentView();
+            var _r9_1 = i0__namespace.ɵɵgetCurrentView();
             i0__namespace.ɵɵelementStart(0, "tr", 4);
             i0__namespace.ɵɵelementStart(1, "td", 10);
             i0__namespace.ɵɵelementStart(2, "a", 11);
-            i0__namespace.ɵɵlistener("click", function QueryListComponent_ng_container_0_tr_9_Template_a_click_2_listener() { i0__namespace.ɵɵrestoreView(_r8_1); var message_r6 = ctx.$implicit; var ctx_r7 = i0__namespace.ɵɵnextContext(2); return ctx_r7.showDetails(message_r6); });
+            i0__namespace.ɵɵlistener("click", function QueryListComponent_ng_container_0_tr_9_Template_a_click_2_listener() { i0__namespace.ɵɵrestoreView(_r9_1); var message_r7 = ctx.$implicit; var ctx_r8 = i0__namespace.ɵɵnextContext(2); return ctx_r8.showDetails(message_r7); });
             i0__namespace.ɵɵtext(3);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
@@ -21490,21 +21464,22 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(12, "td", 12);
             i0__namespace.ɵɵtext(13);
+            i0__namespace.ɵɵpipe(14, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var message_r6 = ctx.$implicit;
+            var message_r7 = ctx.$implicit;
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(message_r6.subject);
+            i0__namespace.ɵɵtextInterpolate(message_r7.subject);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(message_r6.lastSubmittedBy);
+            i0__namespace.ɵɵtextInterpolate(message_r7.lastSubmittedBy);
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(8, 5, message_r6.lastSubmittedDate, "dd MMM YYYY"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(8, 5, message_r7.lastSubmittedDate, "dd MMM YYYY"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(11, 8, message_r6.lastResponseDate, "dd MMM YYYY"));
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind2(11, 8, message_r7.lastResponseDate, "dd MMM YYYY"));
             i0__namespace.ɵɵadvance(3);
-            i0__namespace.ɵɵtextInterpolate(message_r6.lastResponseBy);
+            i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(14, 11, message_r7.responseStatus));
         }
     }
     function QueryListComponent_ng_container_0_Template(rf, ctx) {
@@ -21518,11 +21493,11 @@
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(5, "thead", 3);
             i0__namespace.ɵɵelementStart(6, "tr", 4);
-            i0__namespace.ɵɵtemplate(7, QueryListComponent_ng_container_0_th_7_Template, 4, 4, "th", 5);
+            i0__namespace.ɵɵtemplate(7, QueryListComponent_ng_container_0_th_7_Template, 4, 5, "th", 5);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementStart(8, "tbody", 6);
-            i0__namespace.ɵɵtemplate(9, QueryListComponent_ng_container_0_tr_9_Template, 14, 11, "tr", 7);
+            i0__namespace.ɵɵtemplate(9, QueryListComponent_ng_container_0_tr_9_Template, 15, 13, "tr", 7);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
@@ -21541,11 +21516,11 @@
         function QueryListComponent() {
             this.selectedQuery = new i0.EventEmitter();
             this.displayedColumns = [
-                { name: 'subject', displayName: 'Queries', sortOrder: SortOrder.UNSORTED },
+                { name: 'subject', displayName: 'Query subject', sortOrder: SortOrder.UNSORTED },
                 { name: 'lastSubmittedBy', displayName: 'Last submitted by', sortOrder: SortOrder.UNSORTED },
                 { name: 'lastSubmittedDate', displayName: 'Last submission date', sortOrder: SortOrder.UNSORTED },
                 { name: 'lastResponseDate', displayName: 'Last response date', sortOrder: SortOrder.UNSORTED },
-                { name: 'lastResponseBy', displayName: 'Response by', sortOrder: SortOrder.UNSORTED }
+                { name: 'responseStatus', displayName: 'Response status', sortOrder: SortOrder.UNSORTED }
             ];
         }
         QueryListComponent.prototype.ngOnChanges = function (simpleChanges) {
@@ -21568,13 +21543,16 @@
                 }
             }
         };
-        QueryListComponent.prototype.sortWidget = function (col) {
+        QueryListComponent.prototype.getAriaSortHeaderValue = function (col) {
             switch (col.sortOrder) {
                 case SortOrder.ASCENDING: {
-                    return '▲';
+                    return 'ascending';
+                }
+                case SortOrder.DESCENDING: {
+                    return 'descending';
                 }
                 default: {
-                    return '▼';
+                    return 'none';
                 }
             }
         };
@@ -21608,14 +21586,14 @@
         return QueryListComponent;
     }());
     QueryListComponent.ɵfac = function QueryListComponent_Factory(t) { return new (t || QueryListComponent)(); };
-    QueryListComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryListComponent, selectors: [["ccd-query-list"]], inputs: { partyMessageGroup: "partyMessageGroup" }, outputs: { selectedQuery: "selectedQuery" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-list__table"], [1, "govuk-table__cell", "query-list__caption", "query-list__row"], [1, "govuk-table__head"], [1, "govuk-table__row", "query-list__row"], ["class", "govuk-table__header", 4, "ngFor", "ngForOf"], [1, "govuk-table__body"], ["class", "govuk-table__row query-list__row", 4, "ngFor", "ngForOf"], [1, "govuk-table__header"], ["href", "javascript:void(0)", 1, "sort-widget", 3, "innerHTML", "click"], [1, "govuk-table__cell", "query-list__cell", "query-list__cell--first"], ["href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell"]], template: function QueryListComponent_Template(rf, ctx) {
+    QueryListComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryListComponent, selectors: [["ccd-query-list"]], inputs: { partyMessageGroup: "partyMessageGroup" }, outputs: { selectedQuery: "selectedQuery" }, features: [i0__namespace.ɵɵNgOnChangesFeature], decls: 1, vars: 1, consts: [[4, "ngIf"], [1, "govuk-table", "query-list__table"], [1, "govuk-table__cell", "query-list__caption", "query-list__row"], [1, "govuk-table__head"], [1, "govuk-table__row", "query-list__row"], ["scope", "col", "class", "govuk-table__header", 4, "ngFor", "ngForOf"], [1, "govuk-table__body"], ["class", "govuk-table__row query-list__row", 4, "ngFor", "ngForOf"], ["scope", "col", 1, "govuk-table__header"], ["type", "button", "aria-sort", "none", "href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell", "query-list__cell--first"], ["href", "javascript:void(0)", 3, "click"], [1, "govuk-table__cell", "query-list__cell"]], template: function QueryListComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵtemplate(0, QueryListComponent_ng_container_0_Template, 10, 3, "ng-container", 0);
             }
             if (rf & 2) {
                 i0__namespace.ɵɵproperty("ngIf", ctx.queryListData);
             }
-        }, directives: [i5__namespace.NgIf, i5__namespace.NgForOf], pipes: [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe], styles: [".query-list__caption[_ngcontent-%COMP%], .query-list__table[_ngcontent-%COMP%]{border:1px solid #b1b4b6}.query-list__caption[_ngcontent-%COMP%]{background:#f3f2f1;border-bottom:0;font-weight:700}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:first-child{padding-left:10px}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:last-child{padding-right:10px}.query-list__cell--first[_ngcontent-%COMP%]{width:33%}.sort-widget[_ngcontent-%COMP%]{cursor:pointer;text-decoration:none;color:#000}"] });
+        }, directives: [i5__namespace.NgIf, i5__namespace.NgForOf], pipes: [i1__namespace.RpxTranslatePipe, i5__namespace.DatePipe], styles: ["@charset \"UTF-8\";.query-list__caption[_ngcontent-%COMP%], .query-list__table[_ngcontent-%COMP%]{border:1px solid #b1b4b6}.query-list__caption[_ngcontent-%COMP%]{background:#f3f2f1;border-bottom:0;font-weight:700}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:first-child{padding-left:10px}.query-list__row[_ngcontent-%COMP%] > [_ngcontent-%COMP%]:last-child{padding-right:10px}.query-list__cell--first[_ngcontent-%COMP%]{width:33%}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%], [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover, [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover:hover{background-color:transparent;border-width:0;box-shadow:0 0 0 0;color:#000;cursor:pointer;font-family:inherit;font-weight:inherit;padding:0 10px 0 0;position:relative;text-align:inherit;font-size:1em;margin:0}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:focus, [aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:hover:focus{background-color:#fd0;color:#000;box-shadow:0 -2px #fd0,0 4px #000;outline:none}[aria-sort][_ngcontent-%COMP%]:first-child   button[_ngcontent-%COMP%]{right:auto}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before{content:\" \u25BC\";position:absolute;right:-1px;top:9px;font-size:.5em}[aria-sort][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25B2\";position:absolute;right:-1px;top:1px;font-size:.5em}[aria-sort=ascending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before, [aria-sort=descending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:before{content:none}[aria-sort=ascending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25B2\";font-size:.8em;position:absolute;right:-5px;top:2px}[aria-sort=descending][_ngcontent-%COMP%]   button[_ngcontent-%COMP%]:after{content:\" \u25BC\";font-size:.8em;position:absolute;right:-5px;top:2px}"] });
     (function () {
         (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(QueryListComponent, [{
                 type: i0.Component,
@@ -21859,8 +21837,8 @@
 
     function QueryWriteRaiseQueryComponent_p_22_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 29);
-            i0__namespace.ɵɵelementStart(1, "span", 30);
+            i0__namespace.ɵɵelementStart(0, "p", 25);
+            i0__namespace.ɵɵelementStart(1, "span", 26);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21873,13 +21851,13 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessage.FULL_NAME), " ");
+            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessage.QUERY_SUBJECT), " ");
         }
     }
     function QueryWriteRaiseQueryComponent_p_32_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 31);
-            i0__namespace.ɵɵelementStart(1, "span", 30);
+            i0__namespace.ɵɵelementStart(0, "p", 27);
+            i0__namespace.ɵɵelementStart(1, "span", 26);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21892,13 +21870,13 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r1.raiseQueryErrorMessage.QUERY_SUBJECT), " ");
+            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r1.raiseQueryErrorMessage.QUERY_BODY), " ");
         }
     }
-    function QueryWriteRaiseQueryComponent_p_42_Template(rf, ctx) {
+    function QueryWriteRaiseQueryComponent_p_41_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 32);
-            i0__namespace.ɵɵelementStart(1, "span", 30);
+            i0__namespace.ɵɵelementStart(0, "p", 28);
+            i0__namespace.ɵɵelementStart(1, "span", 26);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21911,32 +21889,13 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r2.raiseQueryErrorMessage.QUERY_BODY), " ");
-        }
-    }
-    function QueryWriteRaiseQueryComponent_p_51_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 33);
-            i0__namespace.ɵɵelementStart(1, "span", 30);
-            i0__namespace.ɵɵtext(2);
-            i0__namespace.ɵɵpipe(3, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵpipe(5, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r3 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r3.raiseQueryErrorMessage.QUERY_HEARING_RELATED), " ");
+            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r2.raiseQueryErrorMessage.QUERY_HEARING_RELATED), " ");
         }
     }
-    function QueryWriteRaiseQueryComponent_ng_container_63_p_7_Template(rf, ctx) {
+    function QueryWriteRaiseQueryComponent_ng_container_53_p_7_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 39);
-            i0__namespace.ɵɵelementStart(1, "span", 30);
+            i0__namespace.ɵɵelementStart(0, "p", 34);
+            i0__namespace.ɵɵelementStart(1, "span", 26);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -21945,39 +21904,39 @@
             i0__namespace.ɵɵelementEnd();
         }
         if (rf & 2) {
-            var ctx_r5 = i0__namespace.ɵɵnextContext(2);
+            var ctx_r4 = i0__namespace.ɵɵnextContext(2);
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r5.raiseQueryErrorMessage.QUERY_HEARING_DATE), " ");
+            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r4.raiseQueryErrorMessage.QUERY_HEARING_DATE), " ");
         }
     }
     var _c0$C = function (a0) { return { "govuk-form-group--error": a0 }; };
-    function QueryWriteRaiseQueryComponent_ng_container_63_Template(rf, ctx) {
+    function QueryWriteRaiseQueryComponent_ng_container_53_Template(rf, ctx) {
         if (rf & 1) {
             i0__namespace.ɵɵelementContainerStart(0);
-            i0__namespace.ɵɵelementStart(1, "div", 34);
-            i0__namespace.ɵɵelementStart(2, "fieldset", 35);
+            i0__namespace.ɵɵelementStart(1, "div", 29);
+            i0__namespace.ɵɵelementStart(2, "fieldset", 30);
             i0__namespace.ɵɵelementStart(3, "legend");
-            i0__namespace.ɵɵelementStart(4, "label", 36);
+            i0__namespace.ɵɵelementStart(4, "label", 31);
             i0__namespace.ɵɵtext(5);
             i0__namespace.ɵɵpipe(6, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtemplate(7, QueryWriteRaiseQueryComponent_ng_container_63_p_7_Template, 6, 6, "p", 37);
-            i0__namespace.ɵɵelement(8, "ccd-query-write-date-input", 38);
+            i0__namespace.ɵɵtemplate(7, QueryWriteRaiseQueryComponent_ng_container_53_p_7_Template, 6, 6, "p", 32);
+            i0__namespace.ɵɵelement(8, "ccd-query-write-date-input", 33);
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementEnd();
             i0__namespace.ɵɵelementContainerEnd();
         }
         if (rf & 2) {
-            var ctx_r4 = i0__namespace.ɵɵnextContext();
+            var ctx_r3 = i0__namespace.ɵɵnextContext();
             i0__namespace.ɵɵadvance(1);
-            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$C, ctx_r4.submitted && ctx_r4.formGroup.get("isHearingRelated").value === true && ctx_r4.formGroup.get("hearingDate").value === null));
+            i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(5, _c0$C, ctx_r3.submitted && ctx_r3.formGroup.get("isHearingRelated").value === true && ctx_r3.formGroup.get("hearingDate").value === null));
             i0__namespace.ɵɵadvance(4);
             i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(6, 3, "Hearing date"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵproperty("ngIf", ctx_r4.submitted && ctx_r4.formGroup.get("isHearingRelated").value === true && ctx_r4.formGroup.get("hearingDate").value === null);
+            i0__namespace.ɵɵproperty("ngIf", ctx_r3.submitted && ctx_r3.formGroup.get("isHearingRelated").value === true && ctx_r3.formGroup.get("hearingDate").value === null);
         }
     }
     var QueryWriteRaiseQueryComponent = /** @class */ (function () {
@@ -21987,7 +21946,7 @@
         return QueryWriteRaiseQueryComponent;
     }());
     QueryWriteRaiseQueryComponent.ɵfac = function QueryWriteRaiseQueryComponent_Factory(t) { return new (t || QueryWriteRaiseQueryComponent)(); };
-    QueryWriteRaiseQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRaiseQueryComponent, selectors: [["ccd-query-write-raise-query"]], inputs: { formGroup: "formGroup", submitted: "submitted" }, decls: 64, vars: 68, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-4"], [1, "govuk-!-margin-bottom-4"], [3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper"], ["for", "fullName", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "fullName-hint", 1, "govuk-hint"], ["id", "fullName-error", "class", "govuk-error-message", 4, "ngIf"], ["type", "text", "name", "fullName", "id", "fullName", 1, "govuk-input", 3, "formControlName"], ["for", "subject", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "subject-hint", 1, "govuk-hint"], ["id", "subject-error", "class", "govuk-error-message", 4, "ngIf"], ["type", "text", "name", "subject", "id", "subject", 1, "govuk-input", 3, "formControlName"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-hint", 1, "govuk-hint"], ["id", "body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "body", "name", "body", "rows", "5", "aria-describedby", "body-hint body-error", 1, "govuk-textarea", 3, "formControlName"], [1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "isHearingRelated-error", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--inline"], [1, "govuk-radios__item"], ["id", "isHearingRelated-yes", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-yes", 1, "govuk-label", "govuk-radios__label"], ["id", "isHearingRelated-no", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-no", 1, "govuk-label", "govuk-radios__label"], [4, "ngIf"], ["id", "fullName-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "subject-error", 1, "govuk-error-message"], ["id", "body-error", 1, "govuk-error-message"], ["id", "isHearingRelated-error", 1, "govuk-error-message"], [1, "govuk-!-margin-top-1", 3, "ngClass"], ["role", "group", 1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--s"], ["id", "hearingDate-error", "class", "govuk-error-message", 4, "ngIf"], ["formControlName", "hearingDate"], ["id", "hearingDate-error", 1, "govuk-error-message"]], template: function QueryWriteRaiseQueryComponent_Template(rf, ctx) {
+    QueryWriteRaiseQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRaiseQueryComponent, selectors: [["ccd-query-write-raise-query"]], inputs: { formGroup: "formGroup", submitted: "submitted" }, decls: 54, vars: 55, consts: [[1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-4"], [1, "govuk-!-margin-bottom-4"], [3, "formGroup"], [1, "govuk-form-group", 3, "ngClass"], [1, "govuk-label-wrapper"], ["for", "subject", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "subject-hint", 1, "govuk-hint"], ["id", "subject-error", "class", "govuk-error-message", 4, "ngIf"], ["type", "text", "name", "subject", "id", "subject", 1, "govuk-input", 3, "formControlName"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-hint", 1, "govuk-hint"], ["id", "body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "body", "name", "body", "rows", "5", "aria-describedby", "body-hint body-error", 1, "govuk-textarea", 3, "formControlName"], [1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "isHearingRelated-error", "class", "govuk-error-message", 4, "ngIf"], ["data-module", "govuk-radios", 1, "govuk-radios", "govuk-radios--inline"], [1, "govuk-radios__item"], ["id", "isHearingRelated-yes", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-yes", 1, "govuk-label", "govuk-radios__label"], ["id", "isHearingRelated-no", "name", "isHearingRelated", "type", "radio", "formControlName", "isHearingRelated", 1, "govuk-radios__input", 3, "checked", "value"], ["for", "isHearingRelated-no", 1, "govuk-label", "govuk-radios__label"], [4, "ngIf"], ["id", "subject-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "body-error", 1, "govuk-error-message"], ["id", "isHearingRelated-error", 1, "govuk-error-message"], [1, "govuk-!-margin-top-1", 3, "ngClass"], ["role", "group", 1, "govuk-fieldset"], [1, "govuk-label", "govuk-label--s"], ["id", "hearingDate-error", "class", "govuk-error-message", 4, "ngIf"], ["formControlName", "hearingDate"], ["id", "hearingDate-error", 1, "govuk-error-message"]], template: function QueryWriteRaiseQueryComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div");
                 i0__namespace.ɵɵelementStart(1, "div", 0);
@@ -22021,6 +21980,7 @@
                 i0__namespace.ɵɵtemplate(22, QueryWriteRaiseQueryComponent_p_22_Template, 6, 6, "p", 9);
                 i0__namespace.ɵɵelement(23, "input", 10);
                 i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementStart(24, "div", 5);
                 i0__namespace.ɵɵelementStart(25, "div", 6);
                 i0__namespace.ɵɵelementStart(26, "label", 11);
@@ -22033,52 +21993,37 @@
                 i0__namespace.ɵɵpipe(31, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵtemplate(32, QueryWriteRaiseQueryComponent_p_32_Template, 6, 6, "p", 13);
-                i0__namespace.ɵɵelement(33, "input", 14);
+                i0__namespace.ɵɵelementStart(33, "textarea", 14);
+                i0__namespace.ɵɵtext(34, "          ");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(34, "div", 5);
-                i0__namespace.ɵɵelementStart(35, "div", 6);
-                i0__namespace.ɵɵelementStart(36, "label", 15);
-                i0__namespace.ɵɵtext(37);
-                i0__namespace.ɵɵpipe(38, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(35, "div", 5);
+                i0__namespace.ɵɵelementStart(36, "fieldset", 15);
+                i0__namespace.ɵɵelementStart(37, "legend");
+                i0__namespace.ɵɵelementStart(38, "label", 16);
+                i0__namespace.ɵɵtext(39);
+                i0__namespace.ɵɵpipe(40, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(39, "div", 16);
-                i0__namespace.ɵɵtext(40);
-                i0__namespace.ɵɵpipe(41, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(42, QueryWriteRaiseQueryComponent_p_42_Template, 6, 6, "p", 17);
-                i0__namespace.ɵɵelementStart(43, "textarea", 18);
-                i0__namespace.ɵɵtext(44, "          ");
-                i0__namespace.ɵɵelementEnd();
+                i0__namespace.ɵɵtemplate(41, QueryWriteRaiseQueryComponent_p_41_Template, 6, 6, "p", 17);
+                i0__namespace.ɵɵelementStart(42, "div", 18);
+                i0__namespace.ɵɵelementStart(43, "div", 19);
+                i0__namespace.ɵɵelement(44, "input", 20);
+                i0__namespace.ɵɵelementStart(45, "label", 21);
+                i0__namespace.ɵɵtext(46);
+                i0__namespace.ɵɵpipe(47, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(45, "div", 5);
-                i0__namespace.ɵɵelementStart(46, "fieldset", 19);
-                i0__namespace.ɵɵelementStart(47, "legend");
-                i0__namespace.ɵɵelementStart(48, "label", 20);
-                i0__namespace.ɵɵtext(49);
-                i0__namespace.ɵɵpipe(50, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(51, QueryWriteRaiseQueryComponent_p_51_Template, 6, 6, "p", 21);
-                i0__namespace.ɵɵelementStart(52, "div", 22);
-                i0__namespace.ɵɵelementStart(53, "div", 23);
-                i0__namespace.ɵɵelement(54, "input", 24);
-                i0__namespace.ɵɵelementStart(55, "label", 25);
-                i0__namespace.ɵɵtext(56);
-                i0__namespace.ɵɵpipe(57, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(58, "div", 23);
-                i0__namespace.ɵɵelement(59, "input", 26);
-                i0__namespace.ɵɵelementStart(60, "label", 27);
-                i0__namespace.ɵɵtext(61);
-                i0__namespace.ɵɵpipe(62, "rpxTranslate");
+                i0__namespace.ɵɵelementStart(48, "div", 19);
+                i0__namespace.ɵɵelement(49, "input", 22);
+                i0__namespace.ɵɵelementStart(50, "label", 23);
+                i0__namespace.ɵɵtext(51);
+                i0__namespace.ɵɵpipe(52, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(63, QueryWriteRaiseQueryComponent_ng_container_63_Template, 9, 7, "ng-container", 28);
+                i0__namespace.ɵɵtemplate(53, QueryWriteRaiseQueryComponent_ng_container_53_Template, 9, 7, "ng-container", 24);
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -22086,61 +22031,48 @@
             }
             if (rf & 2) {
                 var tmp_7_0 = null;
-                var tmp_13_0 = null;
-                var tmp_19_0 = null;
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 34, "Raise a query"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(4, 27, "Raise a query"));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 36, "Enter query details"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(7, 29, "Enter query details"));
                 i0__namespace.ɵɵadvance(6);
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(60, _c0$C, ctx.submitted && ctx.formGroup.get("fullName").hasError("required")));
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 38, "Full name"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(21, 40, "Your full name must be included here"), " ");
-                i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("fullName").hasError("required"));
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-input--error", ctx.submitted && ((tmp_7_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_7_0.hasError("required")));
-                i0__namespace.ɵɵproperty("formControlName", "fullName");
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(62, _c0$C, ctx.submitted && ctx.formGroup.get("subject").hasError("required")));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(49, _c0$C, ctx.submitted && ctx.formGroup.get("subject").hasError("required")));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(28, 42, "Query subject"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(18, 31, "Query subject"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(31, 44, "The subject should be a summary of your query"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(21, 33, "The subject should be a summary of your query"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("subject").hasError("required"));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-input--error", ctx.submitted && ((tmp_13_0 = ctx.formGroup.get("subject")) == null ? null : tmp_13_0.hasError("required")));
+                i0__namespace.ɵɵclassProp("govuk-input--error", ctx.submitted && ((tmp_7_0 = ctx.formGroup.get("subject")) == null ? null : tmp_7_0.hasError("required")));
                 i0__namespace.ɵɵproperty("formControlName", "subject");
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(64, _c0$C, ctx.submitted && ctx.formGroup.get("body").hasError("required")));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(51, _c0$C, ctx.submitted && ctx.formGroup.get("body").hasError("required")));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(38, 46, "Query body"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(28, 35, "Query body"), " ");
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(41, 48, "Include as many details as possible so case workers can respond to your query"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(31, 37, "Include as many details as possible so case workers can respond to your query"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("body").hasError("required"));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-input--error", ctx.submitted && ((tmp_19_0 = ctx.formGroup.get("body")) == null ? null : tmp_19_0.hasError("required")));
+                i0__namespace.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ctx.formGroup.get("body").hasError("required"));
                 i0__namespace.ɵɵproperty("formControlName", "body");
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(66, _c0$C, ctx.submitted && ctx.formGroup.get("isHearingRelated").hasError("required")));
+                i0__namespace.ɵɵproperty("ngClass", i0__namespace.ɵɵpureFunction1(53, _c0$C, ctx.submitted && ctx.formGroup.get("isHearingRelated").hasError("required")));
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(50, 50, "Is the query hearing related?"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(40, 39, "Is the query hearing related?"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ctx.formGroup.get("isHearingRelated").hasError("required"));
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("checked", ctx.formGroup.get("isHearingRelated").value === true)("value", true);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(57, 52, "Is the query hearing related?", null, "Yes"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(47, 41, "Is the query hearing related?", null, "Yes"), " ");
                 i0__namespace.ɵɵadvance(3);
                 i0__namespace.ɵɵproperty("checked", ctx.formGroup.get("isHearingRelated").value === false)("value", false);
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(62, 56, "Is the query hearing related?", null, "No"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind3(52, 45, "Is the query hearing related?", null, "No"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("ngIf", ctx.formGroup.get("isHearingRelated").value);
             }
@@ -22159,10 +22091,10 @@
                 }] });
     })();
 
-    function QueryWriteRespondToQueryComponent_p_30_Template(rf, ctx) {
+    function QueryWriteRespondToQueryComponent_p_27_Template(rf, ctx) {
         if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 20);
-            i0__namespace.ɵɵelementStart(1, "span", 21);
+            i0__namespace.ɵɵelementStart(0, "p", 15);
+            i0__namespace.ɵɵelementStart(1, "span", 16);
             i0__namespace.ɵɵtext(2);
             i0__namespace.ɵɵpipe(3, "rpxTranslate");
             i0__namespace.ɵɵelementEnd();
@@ -22175,26 +22107,7 @@
             i0__namespace.ɵɵadvance(2);
             i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
             i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessages.FULL_NAME), " ");
-        }
-    }
-    function QueryWriteRespondToQueryComponent_p_37_Template(rf, ctx) {
-        if (rf & 1) {
-            i0__namespace.ɵɵelementStart(0, "p", 22);
-            i0__namespace.ɵɵelementStart(1, "span", 21);
-            i0__namespace.ɵɵtext(2);
-            i0__namespace.ɵɵpipe(3, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-            i0__namespace.ɵɵtext(4);
-            i0__namespace.ɵɵpipe(5, "rpxTranslate");
-            i0__namespace.ɵɵelementEnd();
-        }
-        if (rf & 2) {
-            var ctx_r1 = i0__namespace.ɵɵnextContext();
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", i0__namespace.ɵɵpipeBind1(3, 2, "Error:"), " ");
-            i0__namespace.ɵɵadvance(2);
-            i0__namespace.ɵɵtextInterpolate1("", ctx_r1.queryCreateContext === ctx_r1.queryCreateContextEnum.RESPOND ? ctx_r1.raiseQueryErrorMessages.RESPOND_QUERY_BODY : i0__namespace.ɵɵpipeBind1(5, 4, ctx_r1.raiseQueryErrorMessages.QUERY_BODY), " ");
+            i0__namespace.ɵɵtextInterpolate1("", ctx_r0.queryCreateContext === ctx_r0.queryCreateContextEnum.RESPOND ? ctx_r0.raiseQueryErrorMessages.RESPOND_QUERY_BODY : i0__namespace.ɵɵpipeBind1(5, 4, ctx_r0.raiseQueryErrorMessages.QUERY_BODY), " ");
         }
     }
     var _c0$B = function (a3) { return ["/", "cases", "case-details", a3, "tasks"]; };
@@ -22214,7 +22127,7 @@
         return QueryWriteRespondToQueryComponent;
     }());
     QueryWriteRespondToQueryComponent.ɵfac = function QueryWriteRespondToQueryComponent_Factory(t) { return new (t || QueryWriteRespondToQueryComponent)(i0__namespace.ɵɵdirectiveInject(CaseNotifier)); };
-    QueryWriteRespondToQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", queryCreateContext: "queryCreateContext", submitted: "submitted" }, decls: 40, vars: 38, consts: [[1, "govuk-!-margin-bottom-2"], ["href", "javascript:void(0)", 1, "govuk-back-link", "govuk-!-margin-top-0", 3, "routerLink"], [1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "queryItem"], [1, "query-respond"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group"], [1, "govuk-label-wrapper"], ["for", "fullName", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "fullName-hint", 1, "govuk-hint"], ["id", "fullName-error", "class", "govuk-error-message", 4, "ngIf"], ["type", "text", "name", "fullName", "id", "fullName", 1, "govuk-input", 3, "formControlName"], [1, "govuk-form-group", "body-textarea"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "body", "name", "body", "rows", "5", "aria-describedby", "body-hint body-error", 1, "govuk-textarea", 3, "formControlName"], ["id", "fullName-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"], ["id", "body-error", 1, "govuk-error-message"]], template: function QueryWriteRespondToQueryComponent_Template(rf, ctx) {
+    QueryWriteRespondToQueryComponent.ɵcmp = i0__namespace.ɵɵdefineComponent({ type: QueryWriteRespondToQueryComponent, selectors: [["ccd-query-write-respond-to-query"]], inputs: { queryItem: "queryItem", formGroup: "formGroup", queryCreateContext: "queryCreateContext", submitted: "submitted" }, decls: 30, vars: 26, consts: [[1, "govuk-!-margin-bottom-2"], ["href", "javascript:void(0)", 1, "govuk-back-link", "govuk-!-margin-top-0", 3, "routerLink"], [1, "govuk-!-margin-bottom-6"], [1, "govuk-caption-l"], [1, "govuk-heading-l", "govuk-!-margin-bottom-0"], [1, "govuk-!-margin-bottom-4"], [3, "queryItem"], [1, "query-respond"], [1, "govuk-heading-m"], [3, "formGroup"], [1, "govuk-form-group", "body-textarea"], [1, "govuk-label-wrapper"], ["for", "body", 1, "govuk-label", "govuk-label--m", "govuk-!-font-weight-bold"], ["id", "body-error", "class", "govuk-error-message", 4, "ngIf"], ["id", "body", "name", "body", "rows", "5", "aria-describedby", "body-hint body-error", 1, "govuk-textarea", 3, "formControlName"], ["id", "body-error", 1, "govuk-error-message"], [1, "govuk-visually-hidden"]], template: function QueryWriteRespondToQueryComponent_Template(rf, ctx) {
             if (rf & 1) {
                 i0__namespace.ɵɵelementStart(0, "div", 0);
                 i0__namespace.ɵɵelementStart(1, "a", 1);
@@ -22254,23 +22167,9 @@
                 i0__namespace.ɵɵpipe(26, "rpxTranslate");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(27, "div", 13);
-                i0__namespace.ɵɵtext(28);
-                i0__namespace.ɵɵpipe(29, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(30, QueryWriteRespondToQueryComponent_p_30_Template, 6, 6, "p", 14);
-                i0__namespace.ɵɵelement(31, "input", 15);
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementStart(32, "div", 16);
-                i0__namespace.ɵɵelementStart(33, "div", 11);
-                i0__namespace.ɵɵelementStart(34, "label", 17);
-                i0__namespace.ɵɵtext(35);
-                i0__namespace.ɵɵpipe(36, "rpxTranslate");
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵelementEnd();
-                i0__namespace.ɵɵtemplate(37, QueryWriteRespondToQueryComponent_p_37_Template, 6, 6, "p", 18);
-                i0__namespace.ɵɵelementStart(38, "textarea", 19);
-                i0__namespace.ɵɵtext(39, "      ");
+                i0__namespace.ɵɵtemplate(27, QueryWriteRespondToQueryComponent_p_27_Template, 6, 6, "p", 13);
+                i0__namespace.ɵɵelementStart(28, "textarea", 14);
+                i0__namespace.ɵɵtext(29, "      ");
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
                 i0__namespace.ɵɵelementEnd();
@@ -22279,44 +22178,30 @@
             }
             if (rf & 2) {
                 var tmp_7_0 = null;
+                var tmp_9_0 = null;
                 var tmp_10_0 = null;
-                var tmp_11_0 = null;
-                var tmp_13_0 = null;
-                var tmp_15_0 = null;
-                var tmp_16_0 = null;
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction1(36, _c0$B, ctx.caseId));
+                i0__namespace.ɵɵproperty("routerLink", i0__namespace.ɵɵpureFunction1(24, _c0$B, ctx.caseId));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 22, "Cancel and return to tasks"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(3, 14, "Cancel and return to tasks"), " ");
                 i0__namespace.ɵɵadvance(5);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 24, "Respond to the query"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(8, 16, "Respond to query"));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(11, 26, "Query details"));
+                i0__namespace.ɵɵtextInterpolate(i0__namespace.ɵɵpipeBind1(11, 18, "Query details"));
                 i0__namespace.ɵɵadvance(5);
                 i0__namespace.ɵɵproperty("queryItem", ctx.queryItem);
                 i0__namespace.ɵɵadvance(4);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0__namespace.ɵɵpipeBind1(20, 28, "Ask a follow-up question"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Respond to a query" : i0__namespace.ɵɵpipeBind1(20, 20, "Ask a follow-up question"), " ");
                 i0__namespace.ɵɵadvance(2);
                 i0__namespace.ɵɵproperty("formGroup", ctx.formGroup);
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-form-group--error", ctx.submitted && ((tmp_7_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_7_0.hasError("required")));
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(26, 30, "Full name"), " ");
-                i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", i0__namespace.ɵɵpipeBind1(29, 32, "Your full name must be included here"), " ");
-                i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ((tmp_10_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_10_0.hasError("required")));
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-input--error", ctx.submitted && ((tmp_11_0 = ctx.formGroup.get("fullName")) == null ? null : tmp_11_0.hasError("required")));
-                i0__namespace.ɵɵproperty("formControlName", "fullName");
-                i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-form-group--error", ctx.submitted && ((tmp_13_0 = ctx.formGroup.get("body")) == null ? null : tmp_13_0.hasError("required")));
+                i0__namespace.ɵɵclassProp("govuk-form-group--error", ctx.submitted && ((tmp_7_0 = ctx.formGroup.get("body")) == null ? null : tmp_7_0.hasError("required")));
                 i0__namespace.ɵɵadvance(3);
-                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(36, 34, "Query Body"), " ");
+                i0__namespace.ɵɵtextInterpolate1(" ", ctx.queryCreateContext === ctx.queryCreateContextEnum.RESPOND ? "Response message" : i0__namespace.ɵɵpipeBind1(26, 22, "Query Body"), " ");
                 i0__namespace.ɵɵadvance(2);
-                i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ((tmp_15_0 = ctx.formGroup.get("body")) == null ? null : tmp_15_0.hasError("required")));
+                i0__namespace.ɵɵproperty("ngIf", ctx.submitted && ((tmp_9_0 = ctx.formGroup.get("body")) == null ? null : tmp_9_0.hasError("required")));
                 i0__namespace.ɵɵadvance(1);
-                i0__namespace.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ((tmp_16_0 = ctx.formGroup.get("body")) == null ? null : tmp_16_0.hasError("required")));
+                i0__namespace.ɵɵclassProp("govuk-textarea--error", ctx.submitted && ((tmp_10_0 = ctx.formGroup.get("body")) == null ? null : tmp_10_0.hasError("required")));
                 i0__namespace.ɵɵproperty("formControlName", "body");
             }
         }, styles: [".query-respond[_ngcontent-%COMP%]{width:100%;max-width:720px}"] });