diff --git a/components/case/documents.js b/components/case/documents.js
index 7f456f35..d4bfcf6f 100644
--- a/components/case/documents.js
+++ b/components/case/documents.js
@@ -284,9 +284,12 @@ const DocumentDetails = (props) => {
                             {/* {t("case:documents-date-published-label")} */}
                             <button
                                 type="button"
-                                onClick={() => sortDataBy("createdon")}
+                                onClick={() =>
+                                    sortDataBy("pinswg_documentpublisheddate")
+                                }
                                 className={
-                                    orderByState == "createdon"
+                                    orderByState ==
+                                    "pinswg_documentpublisheddate"
                                         ? fieldSortState == "asc"
                                             ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
                                             : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
@@ -688,9 +691,14 @@ const DocumentDetails = (props) => {
                                     {/* {t("case:documents-date-published-label")} */}
                                     <button
                                         type="button"
-                                        onClick={() => sortDataBy("createdon")}
+                                        onClick={() =>
+                                            sortDataBy(
+                                                "pinswg_documentpublisheddate"
+                                            )
+                                        }
                                         className={
-                                            orderByState == "createdon"
+                                            orderByState ==
+                                            "pinswg_documentpublisheddate"
                                                 ? fieldSortState == "asc"
                                                     ? `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortAsc`
                                                     : `govuk-link govuk-link--no-underline govuk-!-font-weight-bold govuk-!-font-size-16 sortDesc`
@@ -837,14 +845,36 @@ const DocumentDetails = (props) => {
                                                     :
                                                 </span>
 
-                                                {_.has(
+                                                {/* {
+                                                    detailsObj.pinswg_documentpublisheddate
+                                                }
+                                                {
+                                                    detailsObj.pinswg_latestpublisheddate
+                                                } */}
+
+                                                {detailsObj.pinswg_documentpublisheddate !=
+                                                null
+                                                    ? formatDates(
+                                                          detailsObj.pinswg_documentpublisheddate
+                                                      )
+                                                    : formatDates(
+                                                          detailsObj.pinswg_latestpublisheddate
+                                                      )}
+                                                {/* {_.has(
                                                     detailsObj,
-                                                    "pinswg_latestpublisheddate"
+                                                    "pinswg_documentpublisheddate"
                                                 )
+                                                    ? formatDates(
+                                                          detailsObj.pinswg_documentpublisheddate
+                                                      )
+                                                    : _.has(
+                                                          detailsObj,
+                                                          "pinswg_latestpublisheddate"
+                                                      )
                                                     ? formatDates(
                                                           detailsObj.pinswg_latestpublisheddate
                                                       )
-                                                    : ""}
+                                                    : ""} */}
                                             </dd>
                                             {/* <dd className="govuk-summary-list__value govuk-!-font-size-16">
                                     <span className="results-visually-hidden">
@@ -960,8 +990,10 @@ const DocumentDetails = (props) => {
     };
 
     const [showDocumentSearchState, setDocumentSearchState] = useState(false);
-    const [orderByState, setOrderbyState] = useState("createdon");
-    const [fieldSortState, setfieldSortState] = useState("asc");
+    const [orderByState, setOrderbyState] = useState(
+        "pinswg_documentpublisheddate"
+    );
+    const [fieldSortState, setfieldSortState] = useState("desc");
 
     let documentSearchState = () => {
         showDocumentSearchState == true
@@ -971,14 +1003,14 @@ const DocumentDetails = (props) => {
 
     const sortDataBy = (whichField) => {
         setOrderbyState(whichField);
-        setfieldSortState("asc");
+        setfieldSortState("desc");
 
         getDocumentResults(1, whichField, fieldSortState);
         whichField == orderByState
-            ? fieldSortState == "desc"
-                ? setfieldSortState("asc")
-                : setfieldSortState("desc")
-            : setfieldSortState("asc");
+            ? fieldSortState == "asc"
+                ? setfieldSortState("desc")
+                : setfieldSortState("asc")
+            : setfieldSortState("desc");
         setCurrentPage(1);
         setShowSpinnerState(true);
     };
diff --git a/pages/api/endpoint/getsearchdocumentdetails_api.js b/pages/api/endpoint/getsearchdocumentdetails_api.js
index f580fc1a..acd87d61 100644
--- a/pages/api/endpoint/getsearchdocumentdetails_api.js
+++ b/pages/api/endpoint/getsearchdocumentdetails_api.js
@@ -59,7 +59,7 @@ export default async function ApiProxy(req, res) {
     var queryUrl =
         "pinswg_documents?$count=true&$filter=pinswg_publishtoweb eq true and _pinswg_documentids_value eq " +
         incidentID +
-        " and pinswg_latestpublishedversion ne null and pinswg_latestpublisheddate ne null&$select=pinswg_isharedocumentlocations,_pinswg_documentids_value,pinswg_isharelabelcasetype,pinswg_isharelabellpaname,pinswg_publishtoweb,pinswg_uploadstatus,pinswg_isharedocumentclassification,pinswg_isharedocumentreference,pinswg_name,pinswg_latestpublishedversion,pinswg_latestpublisheddate";
+        " and pinswg_latestpublishedversion ne null and pinswg_latestpublisheddate ne null&$select=pinswg_isharedocumentlocations,_pinswg_documentids_value,pinswg_isharelabelcasetype,pinswg_isharelabellpaname,pinswg_publishtoweb,pinswg_uploadstatus,pinswg_isharedocumentclassification,pinswg_isharedocumentreference,pinswg_name,pinswg_latestpublishedversion,pinswg_latestpublisheddate,pinswg_documentpublisheddate";
 
     //console.log("docu: ", WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
 
@@ -70,6 +70,12 @@ export default async function ApiProxy(req, res) {
         )
         .then(({ data }) => {
             data.value.forEach(function (element) {
+                Object.assign(element, {
+                    "pinswg_documentpublisheddate":
+                        element.pinswg_documentpublisheddate != null
+                            ? element.pinswg_documentpublisheddate
+                            : element.pinswg_latestpublisheddate,
+                });
                 element.pinswg_hashlink = encryptDocReference(
                     element.pinswg_isharedocumentreference
                 );
diff --git a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js
index 208d8a54..867b006d 100644
--- a/pages/api/endpoint/getsearchdocumentdetailspaged_api.js
+++ b/pages/api/endpoint/getsearchdocumentdetailspaged_api.js
@@ -136,7 +136,7 @@ export default async function ApiProxy(req, res) {
         incidentID +
         " and pinswg_latestpublishedversion ne null and pinswg_latestpublisheddate ne null" +
         docTypeQueryString +
-        "&$select=pinswg_isharedocumentlocations,_pinswg_documentids_value,pinswg_isharelabelcasetype,pinswg_isharelabellpaname,pinswg_publishtoweb,pinswg_uploadstatus,pinswg_isharedocumentclassification,pinswg_isharedocumentreference,pinswg_name,pinswg_latestpublishedversion,pinswg_latestpublisheddate&$orderby=" +
+        "&$select=pinswg_isharedocumentlocations,_pinswg_documentids_value,pinswg_isharelabelcasetype,pinswg_isharelabellpaname,pinswg_publishtoweb,pinswg_uploadstatus,pinswg_isharedocumentclassification,pinswg_isharedocumentreference,pinswg_name,pinswg_latestpublishedversion,pinswg_latestpublisheddate,pinswg_documentpublisheddate&$orderby=" +
         orderby +
         " " +
         fieldSort +
@@ -145,7 +145,7 @@ export default async function ApiProxy(req, res) {
             ? "&$skiptoken=" + ('<cookie pagenumber="' + pageNumber + '" />')
             : "");
 
-    //console.log("docu paged 1: ", queryUrl);
+    console.log("docu paged 1: ", queryUrl);
 
     return axios
         .get(
@@ -154,6 +154,12 @@ export default async function ApiProxy(req, res) {
         )
         .then(({ data }) => {
             data.value.forEach(function (element) {
+                Object.assign(element, {
+                    "pinswg_documentpublisheddate":
+                        element.pinswg_documentpublisheddate != null
+                            ? element.pinswg_documentpublisheddate
+                            : element.pinswg_latestpublisheddate,
+                });
                 element.pinswg_hashlink = encryptDocReference(
                     element.pinswg_isharedocumentreference
                 );
diff --git a/pages/auth/signin.js b/pages/auth/signin.js
index 5882000b..747c76cb 100644
--- a/pages/auth/signin.js
+++ b/pages/auth/signin.js
@@ -182,7 +182,13 @@ export async function getServerSideProps(context) {
         return toUrlObj.toString(); // Return the full new URL as a string
     };
 
-    formURL = appendParamsAndPathToNewUrl(context.query.callbackUrl, formURL);
+    typeof context.query.callbackUrl != "undefined" &&
+        (formURL = appendParamsAndPathToNewUrl(
+            context.query.callbackUrl,
+            formURL
+        ));
+
+    //formURL = appendParamsAndPathToNewUrl(context.query.callbackUrl, formURL);
 
     const url = new URL(formURL); // base URL