From d5f8bb7ed8ceeb9c2ca14a91d3624afda7a43513 Mon Sep 17 00:00:00 2001
From: Dennis Labordus <dennis.labordus@alliander.com>
Date: Wed, 26 Oct 2022 12:47:42 +0200
Subject: [PATCH] fix(editor/subscriber): filtering on FCDAs retains the parent
 (#1048)

Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>

Signed-off-by: Dennis Labordus <dennis.labordus@alliander.com>
---
 src/editors/subscription/fcda-binding-list.ts |  26 +-
 src/editors/subscription/foundation.ts        |  10 +
 .../GooseSubscriberDataBinding.test.ts        |  42 +--
 .../GooseSubscriberLaterBinding.test.ts       |  22 +-
 .../editors/SMVSubscriberDataBinding.test.ts  |  52 +--
 .../editors/SMVSubscriberLaterBinding.test.ts |  23 +-
 test/integration/editors/test-support.ts      |  13 +
 .../fcda-binding-list.test.snap.js            | 325 +++++++++++-------
 8 files changed, 306 insertions(+), 207 deletions(-)

diff --git a/src/editors/subscription/fcda-binding-list.ts b/src/editors/subscription/fcda-binding-list.ts
index 71021ace42..e71f992b69 100644
--- a/src/editors/subscription/fcda-binding-list.ts
+++ b/src/editors/subscription/fcda-binding-list.ts
@@ -25,6 +25,7 @@ import { gooseIcon, smvIcon } from '../../icons/icons.js';
 import { wizards } from '../../wizards/wizard-library.js';
 
 import {
+  getFcdaSubtitleValue,
   getFcdaTitleValue,
   newFcdaSelectEvent,
   styles,
@@ -175,18 +176,11 @@ export class FcdaBindingList extends LitElement {
       twoline
       class="subitem"
       @click=${() => this.onFcdaSelect(controlElement, fcdaElement)}
-      value="${identity(controlElement)} ${identity(fcdaElement)}"
+      value="${identity(controlElement)}
+             ${identity(fcdaElement)}"
     >
       <span>${getFcdaTitleValue(fcdaElement)}</span>
-      <span slot="secondary">
-        ${fcdaElement.getAttribute('ldInst')}${fcdaElement.hasAttribute(
-          'ldInst'
-        ) && fcdaElement.hasAttribute('prefix')
-          ? html`/`
-          : nothing}${fcdaElement.getAttribute('prefix')}
-        ${fcdaElement.getAttribute('lnClass')}
-        ${fcdaElement.getAttribute('lnInst')}
-      </span>
+      <span slot="secondary">${getFcdaSubtitleValue(fcdaElement)}</span>
       <mwc-icon slot="graphic">subdirectory_arrow_right</mwc-icon>
       ${fcdaCount !== 0 ? html`<span slot="meta">${fcdaCount}</span>` : nothing}
     </mwc-list-item>`;
@@ -210,9 +204,15 @@ export class FcdaBindingList extends LitElement {
                     graphic="icon"
                     twoline
                     hasMeta
-                    value="${identity(controlElement)} ${fcdaElements
-                      .map(fcdaElement => identity(fcdaElement) as string)
-                      .join(' ')}"
+                    value="
+                        ${identity(controlElement)}${fcdaElements
+                      .map(
+                        fcdaElement => `
+                        ${getFcdaTitleValue(fcdaElement)}
+                        ${getFcdaSubtitleValue(fcdaElement)}
+                        ${identity(fcdaElement)}`
+                      )
+                      .join('')}"
                   >
                     <mwc-icon-button
                       slot="meta"
diff --git a/src/editors/subscription/foundation.ts b/src/editors/subscription/foundation.ts
index 5f49bf4356..370907e7e6 100644
--- a/src/editors/subscription/foundation.ts
+++ b/src/editors/subscription/foundation.ts
@@ -97,6 +97,16 @@ export function getFcdaTitleValue(fcdaElement: Element): string {
   }${fcdaElement.getAttribute('daName')}`;
 }
 
+export function getFcdaSubtitleValue(fcdaElement: Element): string {
+  return `${fcdaElement.getAttribute('ldInst')} ${
+    fcdaElement.hasAttribute('ldInst') && fcdaElement.hasAttribute('prefix')
+      ? `/`
+      : ''
+  } ${fcdaElement.getAttribute('prefix')} ${fcdaElement.getAttribute(
+    'lnClass'
+  )} ${fcdaElement.getAttribute('lnInst')}`;
+}
+
 export function existExtRef(
   parentInputs: Element,
   fcda: Element,
diff --git a/test/integration/editors/GooseSubscriberDataBinding.test.ts b/test/integration/editors/GooseSubscriberDataBinding.test.ts
index c5119fa80e..77430a7068 100644
--- a/test/integration/editors/GooseSubscriberDataBinding.test.ts
+++ b/test/integration/editors/GooseSubscriberDataBinding.test.ts
@@ -9,6 +9,7 @@ import {
   getExtrefDataBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('GOOSE Subscribe Data Binding Plugin', async () => {
@@ -39,12 +40,13 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
       0
@@ -80,11 +82,11 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -130,11 +132,11 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
       ).length
     ).to.be.equal(1);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -145,11 +147,11 @@ describe('GOOSE Subscribe Data Binding Plugin', async () => {
     )).click();
     await element.requestUpdate();
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
diff --git a/test/integration/editors/GooseSubscriberLaterBinding.test.ts b/test/integration/editors/GooseSubscriberLaterBinding.test.ts
index d2e26d9e07..1222de87d5 100644
--- a/test/integration/editors/GooseSubscriberLaterBinding.test.ts
+++ b/test/integration/editors/GooseSubscriberLaterBinding.test.ts
@@ -7,6 +7,7 @@ import {
   getExtrefLaterBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('GOOSE Subscribe Later Binding Plugin', () => {
@@ -34,12 +35,13 @@ describe('GOOSE Subscribe Later Binding Plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(
       extRefListElement['getSubscribedExtRefElements']().length
@@ -69,11 +71,11 @@ describe('GOOSE Subscribe Later Binding Plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2',
+      'GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
diff --git a/test/integration/editors/SMVSubscriberDataBinding.test.ts b/test/integration/editors/SMVSubscriberDataBinding.test.ts
index 4668801a28..afe357844b 100644
--- a/test/integration/editors/SMVSubscriberDataBinding.test.ts
+++ b/test/integration/editors/SMVSubscriberDataBinding.test.ts
@@ -9,6 +9,7 @@ import {
   getExtrefDataBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('SMV Subscribe Data Binding Plugin', async () => {
@@ -39,12 +40,13 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(extRefListElement['getSubscribedLNElements']().length).to.be.equal(
       1
@@ -80,11 +82,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefDataBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -128,11 +130,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
       ).length
     ).to.be.equal(1);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -143,11 +145,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     )).click();
     await element.requestUpdate();
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
@@ -158,11 +160,11 @@ describe('SMV Subscribe Data Binding Plugin', async () => {
     )).click();
     await element.requestUpdate();
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>fullSmv',
+      'SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
     await extRefListElement.requestUpdate();
 
diff --git a/test/integration/editors/SMVSubscriberLaterBinding.test.ts b/test/integration/editors/SMVSubscriberLaterBinding.test.ts
index 3e54052545..eb2903be17 100644
--- a/test/integration/editors/SMVSubscriberLaterBinding.test.ts
+++ b/test/integration/editors/SMVSubscriberLaterBinding.test.ts
@@ -8,6 +8,7 @@ import {
   getExtrefLaterBindingList,
   getFCDABindingList,
   getSelectedSubItemValue,
+  selectFCDAItem,
 } from './test-support.js';
 
 describe('SMV Subscribe Later Binding plugin', () => {
@@ -35,12 +36,13 @@ describe('SMV Subscribe Later Binding plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>currentOnly',
+      'SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(
       extRefListElement['getSubscribedExtRefElements']().length
@@ -70,12 +72,13 @@ describe('SMV Subscribe Later Binding plugin', () => {
     const fcdaListElement = getFCDABindingList(element);
     const extRefListElement = getExtrefLaterBindingList(element);
 
-    (<HTMLElement>(
-      fcdaListElement.shadowRoot!.querySelector(
-        'mwc-list-item[value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)"]'
-      )
-    )).click();
+    selectFCDAItem(
+      fcdaListElement,
+      'SMV_Publisher>>CurrentTransformer>currentOnly',
+      'SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)'
+    );
     await element.requestUpdate();
+    await extRefListElement.requestUpdate();
 
     expect(
       extRefListElement['getSubscribedExtRefElements']().length
diff --git a/test/integration/editors/test-support.ts b/test/integration/editors/test-support.ts
index b9e1c7ac3d..abc57953e5 100644
--- a/test/integration/editors/test-support.ts
+++ b/test/integration/editors/test-support.ts
@@ -19,6 +19,19 @@ export function getFCDABindingList(
   );
 }
 
+export function selectFCDAItem(
+  listElement: FcdaBindingList,
+  controlIdentity: string,
+  fcdaIdentity: string
+): void {
+  (<HTMLElement>Array.from(
+    listElement.shadowRoot!.querySelectorAll('mwc-list-item[class="subitem"]')
+  ).find(listItem => {
+    const value = listItem.getAttribute('value') ?? '';
+    return value.includes(controlIdentity) && value.includes(fcdaIdentity);
+  })).click();
+}
+
 export function getExtrefDataBindingList(
   element: SMVSubscribeDataBindingPlugin | GooseSubscribeDataBindingPlugin
 ): ExtRefLnBindingList {
diff --git a/test/unit/editors/subscription/__snapshots__/fcda-binding-list.test.snap.js b/test/unit/editors/subscription/__snapshots__/fcda-binding-list.test.snap.js
index 2b876d1c36..bba8d3cf3b 100644
--- a/test/unit/editors/subscription/__snapshots__/fcda-binding-list.test.snap.js
+++ b/test/unit/editors/subscription/__snapshots__/fcda-binding-list.test.snap.js
@@ -23,7 +23,44 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       noninteractive=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)"
+      value="
+                        SMV_Publisher>>CurrentTransformer>fullSmv
+                        AmpSv.instMag.i
+                        CurrentTransformer / L3 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)
+                        AmpSv.q
+                        CurrentTransformer / L3 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)
+                        AmpSv.instMag.i
+                        CurrentTransformer / L2 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)
+                        AmpSv.q
+                        CurrentTransformer / L2 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)
+                        AmpSv.instMag.i
+                        CurrentTransformer / L1 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX)
+                        AmpSv.q
+                        CurrentTransformer / L1 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)
+                        VolSv.instMag.i
+                        VoltageTransformer / L3 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX)
+                        VolSv.q
+                        VoltageTransformer / L3 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)
+                        VolSv.instMag.i
+                        VoltageTransformer / L2 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX)
+                        VolSv.q
+                        VoltageTransformer / L2 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX)
+                        VolSv.instMag.i
+                        VoltageTransformer / L1 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX)
+                        VolSv.q
+                        VoltageTransformer / L1 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)"
     >
       <mwc-icon-button
         class="interactive"
@@ -52,15 +89,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="0"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"
     >
       <span>
         AmpSv.instMag.i
       </span>
       <span slot="secondary">
-        CurrentTransformer/L3
-        TCTR
-        1
+        CurrentTransformer / L3 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -73,15 +109,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"
     >
       <span>
         AmpSv.q
       </span>
       <span slot="secondary">
-        CurrentTransformer/L3
-        TCTR
-        1
+        CurrentTransformer / L3 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -94,15 +129,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)"
     >
       <span>
         AmpSv.instMag.i
       </span>
       <span slot="secondary">
-        CurrentTransformer/L2
-        TCTR
-        1
+        CurrentTransformer / L2 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -115,15 +149,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"
     >
       <span>
         AmpSv.q
       </span>
       <span slot="secondary">
-        CurrentTransformer/L2
-        TCTR
-        1
+        CurrentTransformer / L2 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -136,15 +169,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX)"
     >
       <span>
         AmpSv.instMag.i
       </span>
       <span slot="secondary">
-        CurrentTransformer/L1
-        TCTR
-        1
+        CurrentTransformer / L1 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -157,15 +189,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)"
     >
       <span>
         AmpSv.q
       </span>
       <span slot="secondary">
-        CurrentTransformer/L1
-        TCTR
-        1
+        CurrentTransformer / L1 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -178,15 +209,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX)"
     >
       <span>
         VolSv.instMag.i
       </span>
       <span slot="secondary">
-        VoltageTransformer/L3
-        TVTR
-        1
+        VoltageTransformer / L3 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -199,15 +229,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)"
     >
       <span>
         VolSv.q
       </span>
       <span slot="secondary">
-        VoltageTransformer/L3
-        TVTR
-        1
+        VoltageTransformer / L3 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -220,15 +249,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX)"
     >
       <span>
         VolSv.instMag.i
       </span>
       <span slot="secondary">
-        VoltageTransformer/L2
-        TVTR
-        1
+        VoltageTransformer / L2 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -241,15 +269,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX)"
     >
       <span>
         VolSv.q
       </span>
       <span slot="secondary">
-        VoltageTransformer/L2
-        TVTR
-        1
+        VoltageTransformer / L2 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -262,15 +289,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX)"
     >
       <span>
         VolSv.instMag.i
       </span>
       <span slot="secondary">
-        VoltageTransformer/L1
-        TVTR
-        1
+        VoltageTransformer / L1 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -283,15 +309,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>fullSmv SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>fullSmv
+             SMV_Publisher>>CurrentTransformer>fullSmvsDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)"
     >
       <span>
         VolSv.q
       </span>
       <span slot="secondary">
-        VoltageTransformer/L1
-        TVTR
-        1
+        VoltageTransformer / L1 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -304,7 +329,26 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       noninteractive=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX) SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX) SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)"
+      value="
+                        SMV_Publisher>>CurrentTransformer>voltageOnly
+                        VolSv.instMag.i
+                        VoltageTransformer / L1 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX)
+                        VolSv.q
+                        VoltageTransformer / L1 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)
+                        VolSv.instMag.i
+                        VoltageTransformer / L2 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX)
+                        VolSv.q
+                        VoltageTransformer / L2 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX)
+                        VolSv.instMag.i
+                        VoltageTransformer / L3 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX)
+                        VolSv.q
+                        VoltageTransformer / L3 TVTR 1
+                        SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)"
     >
       <mwc-icon-button
         class="interactive"
@@ -333,15 +377,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>voltageOnly
+             SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv instMag.i (MX)"
     >
       <span>
         VolSv.instMag.i
       </span>
       <span slot="secondary">
-        VoltageTransformer/L1
-        TVTR
-        1
+        VoltageTransformer / L1 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -354,15 +397,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>voltageOnly
+             SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L1 TVTR 1.VolSv q (MX)"
     >
       <span>
         VolSv.q
       </span>
       <span slot="secondary">
-        VoltageTransformer/L1
-        TVTR
-        1
+        VoltageTransformer / L1 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -375,15 +417,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>voltageOnly
+             SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv instMag.i (MX)"
     >
       <span>
         VolSv.instMag.i
       </span>
       <span slot="secondary">
-        VoltageTransformer/L2
-        TVTR
-        1
+        VoltageTransformer / L2 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -396,15 +437,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>voltageOnly
+             SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L2 TVTR 1.VolSv q (MX)"
     >
       <span>
         VolSv.q
       </span>
       <span slot="secondary">
-        VoltageTransformer/L2
-        TVTR
-        1
+        VoltageTransformer / L2 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -417,15 +457,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>voltageOnly
+             SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv instMag.i (MX)"
     >
       <span>
         VolSv.instMag.i
       </span>
       <span slot="secondary">
-        VoltageTransformer/L3
-        TVTR
-        1
+        VoltageTransformer / L3 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -438,15 +477,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>voltageOnly SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>voltageOnly
+             SMV_Publisher>>CurrentTransformer>voltageOnlysDataSet>VoltageTransformer/L3 TVTR 1.VolSv q (MX)"
     >
       <span>
         VolSv.q
       </span>
       <span slot="secondary">
-        VoltageTransformer/L3
-        TVTR
-        1
+        VoltageTransformer / L3 TVTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -459,7 +497,26 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       noninteractive=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX) SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX) SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX) SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"
+      value="
+                        SMV_Publisher>>CurrentTransformer>currentOnly
+                        AmpSv.instMag.i
+                        CurrentTransformer / L1 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX)
+                        AmpSv.q
+                        CurrentTransformer / L1 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)
+                        AmpSv.instMag.i
+                        CurrentTransformer / L2 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)
+                        AmpSv.q
+                        CurrentTransformer / L2 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)
+                        AmpSv.instMag.i
+                        CurrentTransformer / L3 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)
+                        AmpSv.q
+                        CurrentTransformer / L3 TCTR 1
+                        SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"
     >
       <mwc-icon-button
         class="interactive"
@@ -488,15 +545,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>currentOnly
+             SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv instMag.i (MX)"
     >
       <span>
         AmpSv.instMag.i
       </span>
       <span slot="secondary">
-        CurrentTransformer/L1
-        TCTR
-        1
+        CurrentTransformer / L1 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -509,15 +565,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>currentOnly
+             SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L1 TCTR 1.AmpSv q (MX)"
     >
       <span>
         AmpSv.q
       </span>
       <span slot="secondary">
-        CurrentTransformer/L1
-        TCTR
-        1
+        CurrentTransformer / L1 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -530,15 +585,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>currentOnly
+             SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv instMag.i (MX)"
     >
       <span>
         AmpSv.instMag.i
       </span>
       <span slot="secondary">
-        CurrentTransformer/L2
-        TCTR
-        1
+        CurrentTransformer / L2 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -551,15 +605,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>currentOnly
+             SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L2 TCTR 1.AmpSv q (MX)"
     >
       <span>
         AmpSv.q
       </span>
       <span slot="secondary">
-        CurrentTransformer/L2
-        TCTR
-        1
+        CurrentTransformer / L2 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -572,15 +625,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"
+      value="SMV_Publisher>>CurrentTransformer>currentOnly
+             SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv instMag.i (MX)"
     >
       <span>
         AmpSv.instMag.i
       </span>
       <span slot="secondary">
-        CurrentTransformer/L3
-        TCTR
-        1
+        CurrentTransformer / L3 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -593,15 +645,14 @@ snapshots["fcda-binding-list with a SampledValueControl doc loaded looks like th
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="SMV_Publisher>>CurrentTransformer>currentOnly SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"
+      value="SMV_Publisher>>CurrentTransformer>currentOnly
+             SMV_Publisher>>CurrentTransformer>currentOnlysDataSet>CurrentTransformer/L3 TCTR 1.AmpSv q (MX)"
     >
       <span>
         AmpSv.q
       </span>
       <span slot="secondary">
-        CurrentTransformer/L3
-        TCTR
-        1
+        CurrentTransformer / L3 TCTR 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -625,7 +676,23 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       noninteractive=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST) GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST) GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaOpn stVal (ST) GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaCls stVal (ST) GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CILO 1.EnaOpn stVal (ST)"
+      value="
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE2
+                        Pos.stVal
+                        QB2_Disconnector /  CSWI 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)
+                        Pos.q
+                        QB2_Disconnector /  CSWI 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)
+                        EnaOpn.stVal
+                        QB1_Disconnector  null CILO 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaOpn stVal (ST)
+                        EnaCls.stVal
+                        QB1_Disconnector /  CILO 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaCls stVal (ST)
+                        EnaOpn.stVal
+                        QB2_Disconnector  null CILO 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CILO 1.EnaOpn stVal (ST)"
     >
       <mwc-icon-button
         class="interactive"
@@ -655,15 +722,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="0"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos stVal (ST)"
     >
       <span>
         Pos.stVal
       </span>
       <span slot="secondary">
-        QB2_Disconnector/
-        CSWI
-        1
+        QB2_Disconnector /  CSWI 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -680,15 +746,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CSWI 1.Pos q (ST)"
     >
       <span>
         Pos.q
       </span>
       <span slot="secondary">
-        QB2_Disconnector/
-        CSWI
-        1
+        QB2_Disconnector /  CSWI 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -704,15 +769,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaOpn stVal (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaOpn stVal (ST)"
     >
       <span>
         EnaOpn.stVal
       </span>
       <span slot="secondary">
-        QB1_Disconnector
-        CILO
-        1
+        QB1_Disconnector  null CILO 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -725,15 +789,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaCls stVal (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB1_Disconnector/ CILO 1.EnaCls stVal (ST)"
     >
       <span>
         EnaCls.stVal
       </span>
       <span slot="secondary">
-        QB1_Disconnector/
-        CILO
-        1
+        QB1_Disconnector /  CILO 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -746,15 +809,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2 GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CILO 1.EnaOpn stVal (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE2
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE2sDataSet>QB2_Disconnector/ CILO 1.EnaOpn stVal (ST)"
     >
       <span>
         EnaOpn.stVal
       </span>
       <span slot="secondary">
-        QB2_Disconnector
-        CILO
-        1
+        QB2_Disconnector  null CILO 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -767,7 +829,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       noninteractive=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos stVal (ST) GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"
+      value="
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE1
+                        Pos.stVal
+                        QB1_Disconnector /  CSWI 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos stVal (ST)
+                        Pos.q
+                        QB1_Disconnector /  CSWI 1
+                        GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"
     >
       <mwc-icon-button
         class="interactive"
@@ -796,15 +865,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos stVal (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos stVal (ST)"
     >
       <span>
         Pos.stVal
       </span>
       <span slot="secondary">
-        QB1_Disconnector/
-        CSWI
-        1
+        QB1_Disconnector /  CSWI 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right
@@ -817,15 +885,14 @@ snapshots["fcda-binding-list with a GSEControl doc loaded looks like the latest
       mwc-list-item=""
       tabindex="-1"
       twoline=""
-      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1 GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"
+      value="GOOSE_Publisher>>QB2_Disconnector>GOOSE1
+             GOOSE_Publisher>>QB2_Disconnector>GOOSE1sDataSet>QB1_Disconnector/ CSWI 1.Pos q (ST)"
     >
       <span>
         Pos.q
       </span>
       <span slot="secondary">
-        QB1_Disconnector/
-        CSWI
-        1
+        QB1_Disconnector /  CSWI 1
       </span>
       <mwc-icon slot="graphic">
         subdirectory_arrow_right