diff --git a/package.json b/package.json
index 831e1e31c4..8ae8f432a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "serge",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "main": "index.js",
   "repository": "git@github.com:serge-web/serge.git",
   "author": "foxleigh81 <alex@alexfoxleigh.com>",
diff --git a/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap b/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap
index 9f963108ff..6b3da032b3 100644
--- a/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap
+++ b/packages/components/src/local/coa-status-board/__snapshots__/index.spec.tsx.snap
@@ -330,7 +330,7 @@ Array [
         >
           <div
             className="sc-iwsKbI joYMLE rdt_TableRow"
-            id="row-id_3a"
+            id="row-Blue-3"
             onClick={[Function]}
             onDoubleClick={[Function]}
             role="row"
@@ -345,7 +345,7 @@ Array [
                 aria-disabled={false}
                 aria-label="Expand Row"
                 className="sc-gzVnrw eURjsc"
-                data-testid="expander-button-id_3a"
+                data-testid="expander-button-Blue-3"
                 disabled={false}
                 onClick={[Function]}
                 role="button"
@@ -372,7 +372,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={1}
               data-tag="allowRowEvents"
-              id="cell-1-id_3a"
+              id="cell-1-Blue-3"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -388,14 +388,14 @@ Array [
                   className="svg-inline--fa fa-envelope"
                 />
                  
-                id_3a
+                Blue-3
               </div>
             </div>
             <div
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={2}
               data-tag="allowRowEvents"
-              id="cell-2-id_3a"
+              id="cell-2-Blue-3"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -424,7 +424,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={3}
               data-tag="allowRowEvents"
-              id="cell-3-id_3a"
+              id="cell-3-Blue-3"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -443,7 +443,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje EsLZI rdt_TableCell"
               data-column-id={4}
               data-tag="allowRowEvents"
-              id="cell-4-id_3a"
+              id="cell-4-Blue-3"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -472,7 +472,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={5}
               data-tag="allowRowEvents"
-              id="cell-5-id_3a"
+              id="cell-5-Blue-3"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -489,7 +489,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={6}
               data-tag="allowRowEvents"
-              id="cell-6-id_3a"
+              id="cell-6-Blue-3"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -507,7 +507,7 @@ Array [
           </div>
           <div
             className="sc-iwsKbI joYMLE rdt_TableRow"
-            id="row-id_4"
+            id="row-RED-1"
             onClick={[Function]}
             onDoubleClick={[Function]}
             role="row"
@@ -522,7 +522,7 @@ Array [
                 aria-disabled={false}
                 aria-label="Expand Row"
                 className="sc-gzVnrw eURjsc"
-                data-testid="expander-button-id_4"
+                data-testid="expander-button-RED-1"
                 disabled={false}
                 onClick={[Function]}
                 role="button"
@@ -549,7 +549,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={1}
               data-tag="allowRowEvents"
-              id="cell-1-id_4"
+              id="cell-1-RED-1"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -565,14 +565,14 @@ Array [
                   className="svg-inline--fa fa-envelope"
                 />
                  
-                id_4
+                RED-1
               </div>
             </div>
             <div
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={2}
               data-tag="allowRowEvents"
-              id="cell-2-id_4"
+              id="cell-2-RED-1"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -601,7 +601,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={3}
               data-tag="allowRowEvents"
-              id="cell-3-id_4"
+              id="cell-3-RED-1"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -620,7 +620,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje EsLZI rdt_TableCell"
               data-column-id={4}
               data-tag="allowRowEvents"
-              id="cell-4-id_4"
+              id="cell-4-RED-1"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -649,7 +649,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={5}
               data-tag="allowRowEvents"
-              id="cell-5-id_4"
+              id="cell-5-RED-1"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
@@ -666,7 +666,7 @@ Array [
               className="sc-bxivhb sc-ifAKCX sc-EHOje ldAXVh rdt_TableCell"
               data-column-id={6}
               data-tag="allowRowEvents"
-              id="cell-6-id_4"
+              id="cell-6-RED-1"
               onDragEnd={[Function]}
               onDragEnter={[Function]}
               onDragLeave={[Function]}
diff --git a/packages/components/src/local/coa-status-board/helpers/gen-data.tsx b/packages/components/src/local/coa-status-board/helpers/gen-data.tsx
index 1268f8d119..f6f92528e5 100644
--- a/packages/components/src/local/coa-status-board/helpers/gen-data.tsx
+++ b/packages/components/src/local/coa-status-board/helpers/gen-data.tsx
@@ -209,7 +209,7 @@ export const genData = (
     }
 
     const row: Row = {
-      id: message._id || message.message.Reference,
+      id: message.message.Reference || message._id,
       from: message.details.from.roleName,
       title: message.message.Title,
       status: status,
diff --git a/packages/components/src/local/molecules/json-editor/index.tsx b/packages/components/src/local/molecules/json-editor/index.tsx
index f1f93d1c93..b2e47ff506 100644
--- a/packages/components/src/local/molecules/json-editor/index.tsx
+++ b/packages/components/src/local/molecules/json-editor/index.tsx
@@ -19,7 +19,7 @@ export const JsonEditor: React.FC<Props> = ({ messageTemplates, messageId, messa
   const jsonEditorRef = useRef<HTMLDivElement>(null)
   const [editor, setEditor] = useState<Editor | null>(null)
 
-  const schema = messageTemplates[template]
+  const schema = messageTemplates[template] || Object.values(messageTemplates).find((item: any) => item.title === template)
 
   if (!schema) {
     const styles = {
diff --git a/packages/helpers/src/most-recent-only.ts b/packages/helpers/src/most-recent-only.ts
index 3ca56703e3..732e78b3b5 100644
--- a/packages/helpers/src/most-recent-only.ts
+++ b/packages/helpers/src/most-recent-only.ts
@@ -9,6 +9,10 @@ const getIDs = (message: MessageChannel): string => {
   if (message.messageType === INFO_MESSAGE_CLIPPED || message.infoType === true) {
     res = '' + message.gameTurn
   } else {
+    if(!message) {
+      console.log('message missing:', message)
+      return new Date().toString()
+    }
     const msg = message.message
     if (msg.Reference !== undefined) {
       res = msg.Reference
diff --git a/packages/server/db/message_types b/packages/server/db/message_types
index 3a5e7fd33b..6b6b2f0a82 100644
Binary files a/packages/server/db/message_types and b/packages/server/db/message_types differ
diff --git a/packages/server/db/pouch__all_dbs__ b/packages/server/db/pouch__all_dbs__
index c2a7983534..a3c2beaffa 100644
Binary files a/packages/server/db/pouch__all_dbs__ and b/packages/server/db/pouch__all_dbs__ differ
diff --git a/packages/server/db/wargame-kskl1i3t.sqlite b/packages/server/db/wargame-kskl1i3t.sqlite
index 66891883ed..b7465cf485 100644
Binary files a/packages/server/db/wargame-kskl1i3t.sqlite and b/packages/server/db/wargame-kskl1i3t.sqlite differ
diff --git a/packages/server/db/wargame-kx691lik.sqlite b/packages/server/db/wargame-kx691lik.sqlite
new file mode 100644
index 0000000000..7ca0ca63c3
Binary files /dev/null and b/packages/server/db/wargame-kx691lik.sqlite differ