diff --git a/pages/api/endpoint/getbasicdnssearch_api.js b/pages/api/endpoint/getbasicdnssearch_api.js
index 68c29b9e..2c583f2a 100644
--- a/pages/api/endpoint/getbasicdnssearch_api.js
+++ b/pages/api/endpoint/getbasicdnssearch_api.js
@@ -16,42 +16,31 @@
  *         description: Success
  */
 
-import axios from "axios";
 import _ from "lodash";
 import { azureHeadersPaged } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
-    try {
-        const token = await getToken();
+    const queryUrl =
+        "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=(pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002)and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
 
-        const queryUrl =
-            "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=(pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002)and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+    return relayGet({
+        queryUrl,
+        res,
+        requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
+        transformData: (data) => {
+            if (_.has(data, "@odata.nextLink") === true) {
+                const dataStr = JSON.stringify(data["@odata.nextLink"]);
+                data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
+            }
 
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
-        );
-
-        if (_.has(data, "@odata.nextLink") === true) {
-            const dataStr = JSON.stringify(data["@odata.nextLink"]);
-            data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
-        }
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+            return data;
+        },
+        errorResponse: {
             status: 400,
             code: "BASIC_DNS_SEARCH_FETCH_FAILED",
             message: "Failed to fetch basic DNS search results"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getbasicdnsurlsearch_api.js b/pages/api/endpoint/getbasicdnsurlsearch_api.js
index c1a2f175..e2155985 100644
--- a/pages/api/endpoint/getbasicdnsurlsearch_api.js
+++ b/pages/api/endpoint/getbasicdnsurlsearch_api.js
@@ -16,17 +16,10 @@
  *         description: Success
  */
 
-import axios from "axios";
 import _ from "lodash";
 import { azureHeadersPaged } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
     const searchString = req.query.searchString;
@@ -39,34 +32,31 @@ export default async function ApiProxy(req, res) {
         });
     }
 
-    try {
-        const token = await getToken();
-        const escapedSearchString = searchString.replace(/\'/g, "''");
+    const escapedSearchString = searchString.replace(/\'/g, "''");
 
-        const queryUrl =
-            "incidents?$select=pinswg_environmentalstatementlocation,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
-            escapedSearchString +
-            "') or contains(ticketnumber, '" +
-            escapedSearchString +
-            "')) and (pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002 ) and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+    const queryUrl =
+        "incidents?$select=pinswg_environmentalstatementlocation,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
+        escapedSearchString +
+        "') or contains(ticketnumber, '" +
+        escapedSearchString +
+        "')) and (pinswg_appealcasetype eq 846040011 or pinswg_appealcasetype eq 846040002 ) and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
 
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
-        );
+    return relayGet({
+        queryUrl,
+        res,
+        requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
+        transformData: (data) => {
+            let dataStr;
+            _.has(data, "@odata.nextLink") === true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
 
-        let dataStr;
-        _.has(data, "@odata.nextLink") === true &&
-            ((dataStr = JSON.stringify(data["@odata.nextLink"])),
-            (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+            return data;
+        },
+        errorResponse: {
             status: 400,
             code: "BASIC_DNS_URL_SEARCH_FETCH_FAILED",
             message: "Failed to fetch DNS URL search results"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getbasicsearch_api.js b/pages/api/endpoint/getbasicsearch_api.js
index c7d5d604..61726fc7 100644
--- a/pages/api/endpoint/getbasicsearch_api.js
+++ b/pages/api/endpoint/getbasicsearch_api.js
@@ -15,16 +15,9 @@
  *         description: Success
  */
 
-import axios from "axios";
 import { azureHeadersPaged } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
     const searchString = req.query.searchString;
@@ -37,40 +30,37 @@ export default async function ApiProxy(req, res) {
         });
     }
 
-    try {
-        const token = await getToken();
-        const escapedSearchString = searchString.replace(/\'/g, "''");
+    const escapedSearchString = searchString.replace(/\'/g, "''");
 
-        const queryUrl =
-            "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
-            escapedSearchString +
-            "') or contains(ticketnumber, '" +
-            escapedSearchString +
-            "') or contains(pinswg_lpareference, '" +
-            escapedSearchString +
-            "')) and pinswg_appealcasetype ne null " +
-            (process.env.SHOWSIPS !== "true"
-                ? "and pinswg_appealcasetype ne 846040002 "
-                : "") +
-            "and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+    const queryUrl =
+        "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
+        escapedSearchString +
+        "') or contains(ticketnumber, '" +
+        escapedSearchString +
+        "') or contains(pinswg_lpareference, '" +
+        escapedSearchString +
+        "')) and pinswg_appealcasetype ne null " +
+        (process.env.SHOWSIPS !== "true"
+            ? "and pinswg_appealcasetype ne 846040002 "
+            : "") +
+        "and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
 
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
-        );
+    return relayGet({
+        queryUrl,
+        res,
+        requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
+        transformData: (data) => {
+            if (Object.prototype.hasOwnProperty.call(data, "@odata.nextLink")) {
+                const dataStr = JSON.stringify(data["@odata.nextLink"]);
+                data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
+            }
 
-        if (Object.prototype.hasOwnProperty.call(data, "@odata.nextLink")) {
-            const dataStr = JSON.stringify(data["@odata.nextLink"]);
-            data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
-        }
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+            return data;
+        },
+        errorResponse: {
             status: 400,
             code: "BASIC_SEARCH_FETCH_FAILED",
             message: "Failed to fetch basic search results"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getcasemessage_api.js b/pages/api/endpoint/getcasemessage_api.js
index 8adaf604..a7a11509 100644
--- a/pages/api/endpoint/getcasemessage_api.js
+++ b/pages/api/endpoint/getcasemessage_api.js
@@ -15,16 +15,9 @@
  *         description: Success
  */
 
-import axios from "axios";
 import { azureHeadersPaged } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
     const caseId = req.query.id;
@@ -37,26 +30,19 @@ export default async function ApiProxy(req, res) {
         });
     }
 
-    try {
-        const token = await getToken();
+    const queryUrl =
+        "tasks?$select=_regardingobjectid_value,subject,description,createdon,statuscode,scheduledend,scheduledstart&$count=true&$filter=_regardingobjectid_value eq " +
+        caseId +
+        " and contains(subject, 'Banner') and statuscode ne 5&$orderby=createdon desc";
 
-        const queryUrl =
-            "tasks?$select=_regardingobjectid_value,subject,description,createdon,statuscode,scheduledend,scheduledstart&$count=true&$filter=_regardingobjectid_value eq " +
-            caseId +
-            " and contains(subject, 'Banner') and statuscode ne 5&$orderby=createdon desc";
-
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
-        );
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+    return relayGet({
+        queryUrl,
+        res,
+        requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
+        errorResponse: {
             status: 400,
             code: "CASE_MESSAGE_FETCH_FAILED",
             message: "Failed to fetch case messages"
-        });
-    }
+        }
+    });
 }
diff --git a/pages/api/endpoint/getpartsavedappeal_api.js b/pages/api/endpoint/getpartsavedappeal_api.js
index ad1358c5..6e2eff3f 100644
--- a/pages/api/endpoint/getpartsavedappeal_api.js
+++ b/pages/api/endpoint/getpartsavedappeal_api.js
@@ -1,14 +1,7 @@
-import axios from "axios";
 import _ from "lodash";
 import { azureHeadersPaged } from "../../../actions/core/headers";
-import { consoleLogger } from "../../../actions/core/logger";
-import { getToken } from "../../../actions/core/token";
-import { hashAPIPath } from "../../../actions/core/hash";
-import { respondError, respondSuccess } from "../middleware/apiResponse";
-
-const WEBAPI_URL =
-    process.env.RELAY_ROOT ||
-    "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
+import { respondError } from "../middleware/apiResponse";
+import { relayGet } from "../middleware/relayForwarding";
 
 export default async function ApiProxy(req, res) {
     const searchString = req.query.searchString;
@@ -21,34 +14,31 @@ export default async function ApiProxy(req, res) {
         });
     }
 
-    try {
-        const token = await getToken();
-        const escapedSearchString = searchString.replace(/\'/g, "''");
+    const escapedSearchString = searchString.replace(/\'/g, "''");
 
-        const queryUrl =
-            "incidents?$select=pinswg_environmentalstatementlocation,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
-            escapedSearchString +
-            "') or contains(ticketnumber, '" +
-            escapedSearchString +
-            "')) and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
+    const queryUrl =
+        "incidents?$select=pinswg_environmentalstatementlocation,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
+        escapedSearchString +
+        "') or contains(ticketnumber, '" +
+        escapedSearchString +
+        "')) and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
 
-        const { data } = await axios.get(
-            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-            azureHeadersPaged(token.access_token)
-        );
+    return relayGet({
+        queryUrl,
+        res,
+        requestOptionsBuilder: (accessToken) => azureHeadersPaged(accessToken),
+        transformData: (data) => {
+            let dataStr;
+            _.has(data, "@odata.nextLink") === true &&
+                ((dataStr = JSON.stringify(data["@odata.nextLink"])),
+                (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
 
-        let dataStr;
-        _.has(data, "@odata.nextLink") === true &&
-            ((dataStr = JSON.stringify(data["@odata.nextLink"])),
-            (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
-
-        return respondSuccess(res, data);
-    } catch (error) {
-        consoleLogger(error);
-        return respondError(res, {
+            return data;
+        },
+        errorResponse: {
             status: 400,
             code: "PART_SAVED_APPEAL_FETCH_FAILED",
             message: "Failed to fetch part-saved appeals"
-        });
-    }
+        }
+    });
 }