diff --git a/electron/analytics.js b/electron/analytics.js
index f7f22eb..2a45eb7 100644
--- a/electron/analytics.js
+++ b/electron/analytics.js
@@ -20,8 +20,8 @@ Nucleus.onError = (type, err) => {
 };
 
 ipcMain.on(ipcTypes.app.toMain.setUserName, (event, userName) => {
-  Nucleus.appStarted();
   Nucleus.setUserId(userName);
+  Nucleus.appStarted();
 });
 
 ipcMain.on(ipcTypes.app.toMain.track, (e, args) => {
diff --git a/electron/decoder/decoder.js b/electron/decoder/decoder.js
index 0d80ce4..e323bd0 100644
--- a/electron/decoder/decoder.js
+++ b/electron/decoder/decoder.js
@@ -51,8 +51,8 @@ async function DecodeEstimate(filePath, includeFilePathInReturnJob = false) {
 
   const ad2 = await DecodeAd2File(extensionlessFilePath);
 
-  if (job.OWNR_FN === "") job.OWNR_FN = ad2.CLMT_FN;
-  if (job.OWNR_LN === "") job.OWNR_LN = ad2.CLMT_LN;
+  if (job.OWNR_FN === "" || !job.OWNR_FN) job.OWNR_FN = ad2.CLMT_FN;
+  if (job.OWNR_LN === "" || !job.OWNR_LN) job.OWNR_LN = ad2.CLMT_LN;
 
   const accepted_ins_co = store.get("accepted_ins_co");
 
diff --git a/electron/file-watcher/file-watcher.js b/electron/file-watcher/file-watcher.js
index ba2522b..5f17c14 100644
--- a/electron/file-watcher/file-watcher.js
+++ b/electron/file-watcher/file-watcher.js
@@ -70,7 +70,7 @@ async function StartWatcher() {
     .on("error", function (error) {
       log.error("Error in Watcher", error);
       const b = BrowserWindow.getFocusedWindow();
-      b.webContents.send(ipcTypes.fileWatcher.toRenderer.error, error);
+      b.webContents.send(ipcTypes.default.fileWatcher.toRenderer.error, error);
       Nucleus.track("WATCHER_ERROR", error);
     })
     .on("ready", onWatcherReady)
diff --git a/electron/main.js b/electron/main.js
index 60ceeb5..0568aee 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -67,7 +67,7 @@ var menu = Menu.buildFromTemplate([
     // Other code removed for brevity
   },
   {
-    label: "Help",
+    label: isDev ? "DEVELOPMENT -- HELP" : "Help",
     submenu: [
       {
         label: "Rescue",
diff --git a/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx b/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx
index 118b090..7731a5c 100644
--- a/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx
+++ b/src/components/organisms/jobs-list-search/jobs-list-search.organism.jsx
@@ -4,12 +4,11 @@ import { Dropdown, List, Menu, Spin } from "antd";
 import React, { useState } from "react";
 import InfiniteScroll from "react-infinite-scroller";
 import { SEARCH_JOBS_PAGINATED } from "../../../graphql/jobs.queries";
-import ipcTypes from "../../../ipc.types";
 import ErrorResultAtom from "../../atoms/error-result/error-result.atom";
 import JobsListItemMolecule from "../../molecules/jobs-list-item/jobs-list-item.molecule";
 import JobsSearchFieldsMolecule from "../../molecules/jobs-search-fields/jobs-search-fields.molecule";
 
-const { ipcRenderer } = window;
+
 
 const limit = 20;
 export default function JobsTableOrganism() {
@@ -36,9 +35,9 @@ export default function JobsTableOrganism() {
 
   const handleInfiniteOnLoad = (page) => {
     if (fetchMore) {
-      ipcRenderer.send(ipcTypes.default.app.toMain.track, {
-        event: "FETCH_MORE_JOBS",
-      });
+      // ipcRenderer.send(ipcTypes.default.app.toMain.track, {
+      //   event: "FETCH_MORE_JOBS",
+      // });
       fetchMore({
         variables: {
           offset: limit * page,
diff --git a/src/redux/application/application.reducer.js b/src/redux/application/application.reducer.js
index 549bbcc..c4be730 100644
--- a/src/redux/application/application.reducer.js
+++ b/src/redux/application/application.reducer.js
@@ -57,9 +57,9 @@ const applicationReducer = (state = INITIAL_STATE, action) => {
         selectedJobTargetPc: action.payload,
       };
     case ApplicationActionTypes.SET_SELECTED_JOB_ID:
-      ipcRenderer.send(ipcTypes.default.app.toMain.track, {
-        event: "SET_SELECTED_JOB",
-      });
+      // ipcRenderer.send(ipcTypes.default.app.toMain.track, {
+      //   event: "SET_SELECTED_JOB",
+      // });
       return { ...state, selectedJobId: action.payload };
     case ApplicationActionTypes.SET_SETTINGS:
       return { ...state, settings: { ...state.settings, ...action.payload } };