diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 000000000..75e6b0da2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,8 @@
+{
+  "xml.fileAssociations": [
+    {
+      "pattern": "**/Test.xml",
+      "systemId": "file:///Users/pfic/Downloads/IMEX.xsd"
+    }
+  ]
+}
diff --git a/client/src/components/job-create-iou/job-create-iou.component.jsx b/client/src/components/job-create-iou/job-create-iou.component.jsx
index 9a7995077..8ebc8fb75 100644
--- a/client/src/components/job-create-iou/job-create-iou.component.jsx
+++ b/client/src/components/job-create-iou/job-create-iou.component.jsx
@@ -78,6 +78,9 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines }) {
     <Popconfirm
       title={t("jobs.labels.createiouwarning")}
       onConfirm={handleCreateIou}
+      disabled={
+        !selectedJobLines || selectedJobLines.length === 0 || !job.converted
+      }
     >
       <Button
         loading={loading}
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
index b4e6e1384..8220e00b4 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
@@ -108,7 +108,9 @@ export async function CreateIouForJob(
   _tempLines.forEach((line) => {
     delete line.id;
     delete line.__typename;
-    line.oem_partno = `${line.oem_partno} - IOU $${line.act_price}/${line.mod_lb_hrs}hrs`;
+    line.oem_partno = `${line.oem_partno ? `${line.oem_partno} - ` : ``}IOU $${
+      line.act_price || 0
+    }/${line.mod_lb_hrs || 0}hrs`;
     line.act_price = 0;
     line.mod_lb_hrs = 0;
     line.manual_line = true;
diff --git a/client/src/components/profile-shops/profile-shops.container.jsx b/client/src/components/profile-shops/profile-shops.container.jsx
index f8d18dd44..ecfc6a03a 100644
--- a/client/src/components/profile-shops/profile-shops.container.jsx
+++ b/client/src/components/profile-shops/profile-shops.container.jsx
@@ -7,8 +7,25 @@ import {
 } from "../../graphql/associations.queries";
 import AlertComponent from "../alert/alert.component";
 import ProfileShopsComponent from "./profile-shops.component";
+import axios from "axios";
+import { messaging } from "../../firebase/firebase.utils";
+import { getToken } from "firebase/messaging";
 
-export default function ProfileShopsContainer() {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(ProfileShopsContainer);
+
+export function ProfileShopsContainer({ bodyshop }) {
   const { loading, error, data } = useQuery(QUERY_ALL_ASSOCIATIONS, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
@@ -18,6 +35,11 @@ export default function ProfileShopsContainer() {
   const updateActiveShop = async (activeShopId) => {
     logImEXEvent("profile_change_active_shop");
 
+    await axios.post("/notifications/unsubscribe", {
+      fcm_tokens: await getToken(messaging),
+      imexshopid: bodyshop.imexshopid,
+      type: "messaging",
+    });
     await Promise.all(
       data.associations.map(async (record) => {
         await updateAssocation({
diff --git a/client/src/firebase/firebase.utils.js b/client/src/firebase/firebase.utils.js
index 87f5189e7..34b4c353e 100644
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -67,6 +67,7 @@ export const requestForToken = () => {
       console.log("An error occurred while retrieving token. ", err);
     });
 };
+
 export const onMessageListener = () =>
   new Promise((resolve) => {
     onMessage(messaging, (payload) => {
diff --git a/client/src/redux/user/user.sagas.js b/client/src/redux/user/user.sagas.js
index 232d455c7..0507d109b 100644
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -38,7 +38,9 @@ import {
   validatePasswordResetSuccess,
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-
+import axios from "axios";
+import { messaging } from "../../firebase/firebase.utils";
+import { getToken } from "firebase/messaging";
 export function* onEmailSignInStart() {
   yield takeLatest(UserActionTypes.EMAIL_SIGN_IN_START, signInWithEmail);
 }
@@ -98,6 +100,15 @@ export function* signOutStart() {
   try {
     logImEXEvent("redux_sign_out");
 
+    const state = yield select();
+    console.log(yield getToken(messaging));
+    //unsub from topic.
+    yield call(axios.post, "/notifications/unsubscribe", {
+      fcm_tokens: yield getToken(messaging),
+      imexshopid: state.user.bodyshop.imexshopid,
+      type: "messaging",
+    });
+
     yield signOut(auth);
     yield put(signOutSuccess());
     localStorage.removeItem("token");
diff --git a/server.js b/server.js
index 3882a7f14..b3184f39a 100644
--- a/server.js
+++ b/server.js
@@ -139,6 +139,11 @@ app.post(
   fb.sendNotification
 );
 app.post("/notifications/subscribe", fb.validateFirebaseIdToken, fb.subscribe);
+app.post(
+  "/notifications/unsubscribe",
+  fb.validateFirebaseIdToken,
+  fb.unsubscribe
+);
 app.post("/adm/updateuser", fb.validateFirebaseIdToken, fb.updateUser);
 
 //Stripe Processing
diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 45fdf5f5c..1475ceccf 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -47,6 +47,7 @@ exports.default = async (req, res) => {
       try {
         const { jobs } = await client.request(queries.AUTOHOUSE_QUERY, {
           bodyshopid: bodyshop.id,
+          start: moment().subtract(30, "days").startOf("day"),
         });
 
         const autoHouseObject = {
@@ -72,8 +73,8 @@ exports.default = async (req, res) => {
         var ret = builder
           .create(
             {
-              version: "1.0",
-              encoding: "UTF-8",
+              // version: "1.0",
+              // encoding: "UTF-8",
               //keepNullNodes: true,
             },
             autoHouseObject
@@ -111,9 +112,9 @@ exports.default = async (req, res) => {
       }
     }
     res.json(allxmlsToUpload);
-    return;
+
     if (process.env.NODE_ENV !== "production") {
-      res.sendStatus(200);
+      res.json(allxmlsToUpload);
       return;
     }
 
@@ -691,7 +692,7 @@ const GenerateDetailLines = (line, statuses) => {
       0,
     //Critical: null,
     Description: line.line_desc || "",
-    DiscountMarkup: line.prt_dsmk_m || "",
+    DiscountMarkup: line.prt_dsmk_m || 0,
     InvoiceNumber: line.billlines[0] && line.billlines[0].bill.invoice_number,
     IOUPart: 0,
     LineNumber: line.line_no || 0,
@@ -746,12 +747,12 @@ const generateNullDetailLine = () => {
     Vendor: "",
     VendorPaid: null,
     VendorPrice: 0,
-    Deleted: null,
-    ExpectedOn: null,
-    ReceivedOn: null,
-    OrderedBy: null,
-    ShipVia: null,
-    VendorContact: null,
-    EstimateAmount: null,
+    Deleted: 0,
+    ExpectedOn: "",
+    ReceivedOn: "",
+    OrderedBy: "",
+    ShipVia: "",
+    VendorContact: "",
+    EstimateAmount: 0,
   };
 };
diff --git a/server/firebase/firebase-handler.js b/server/firebase/firebase-handler.js
index bd192f71e..42e6f19a6 100644
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -118,6 +118,21 @@ exports.subscribe = async (req, res) => {
   res.json(result);
 };
 
+exports.unsubscribe = async (req, res) => {
+  try {
+    const result = await admin
+      .messaging()
+      .unsubscribeFromTopic(
+        req.body.fcm_tokens,
+        `${req.body.imexshopid}-${req.body.type}`
+      );
+
+    res.json(result);
+  } catch (error) {
+    res.sendStatus(500);
+  }
+};
+
 exports.validateFirebaseIdToken = async (req, res, next) => {
   if (
     (!req.headers.authorization ||
diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js
index 86459e3d1..bac54912b 100644
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -525,7 +525,7 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
 }`;
 
 exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshopid: uuid!) {
-  jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {shopid: {_eq: $bodyshopid}}]}) {
+  jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {shopid: {_eq: $bodyshopid}}]} ) {
     id
     ro_number
     status