sf-i-events 1.0.909 → 1.0.911

package/src/sf-i-events.ts

@@ -969,7 +969,7 @@ export class SfIEvents extends LitElement {
               tempHtml += ', ';
             }
           }
-          html += ('<div><sf-i-elastic-text class="statute-summary id-9" text="' + tempHtml + '" minlength="50"></sf-i-elastic-text></div>');
+          html += ('<div><sf-i-elastic-text exportparts="highlight,highlight-count" class="statute-summary id-9" text="' + tempHtml + '" minlength="50"></sf-i-elastic-text></div>');
           html += '</td>';
 
           html += '</tr>';
@@ -1035,14 +1035,14 @@ export class SfIEvents extends LitElement {
       html += '<td part="td-body1" class="' + classBg + '">';
       if (jsonFilterOnboarding[i].excludestatutes != null) {
         for (var j = 0; j < jsonFilterOnboarding[i].excludestatutes.length; j++) {
-          html += ('<div><sf-i-elastic-text class="statute-summary id-9" text="' + jsonFilterOnboarding[i].excludestatutes[j] + '" minlength="10"></sf-i-elastic-text></div>');
+          html += ('<div><sf-i-elastic-text exportparts="highlight,highlight-count" class="statute-summary id-9" text="' + jsonFilterOnboarding[i].excludestatutes[j] + '" minlength="10"></sf-i-elastic-text></div>');
         }
       }
       html += '</td>';
       html += '<td part="td-body1" class="' + classBg + '">';
       if (jsonFilterOnboarding[i].includestatutes != null) {
         for (var j = 0; j < jsonFilterOnboarding[i].includestatutes.length; j++) {
-          html += ('<div><sf-i-elastic-text class="statute-summary id-9" text="' + jsonFilterOnboarding[i].includestatutes[j] + '" minlength="20"></sf-i-elastic-text></div>');
+          html += ('<div><sf-i-elastic-text exportparts="highlight,highlight-count" class="statute-summary id-9" text="' + jsonFilterOnboarding[i].includestatutes[j] + '" minlength="20"></sf-i-elastic-text></div>');
         }
       }
       html += '</td>';
@@ -1683,6 +1683,9 @@ export class SfIEvents extends LitElement {
 
   recentlyReported: any = {}
 
+  registerFilters: { [key: string]: { [key: string]: boolean } } = {};
+
+  tablecols: string[] = []
   static override styles = css`
 
     .bg-white {
@@ -2710,7 +2713,8 @@ export class SfIEvents extends LitElement {
       right: 5px;
       background-color: white;
       border: solid 1px #888;
-      border-radius: 5px
+      border-radius: 5px;
+      width: max-content;
     }
 
     .filter-button-container{
@@ -4766,7 +4770,7 @@ export class SfIEvents extends LitElement {
     html += '<div class="stream-events-container flex-grow" part="' + bgStatus + '">';
     html += '<div class="hidden-tags hide">' + JSON.stringify(event['tags']) + '</div>'
     html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-    // html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.concise == null ? "100" : "60") + '"></sf-i-elastic-text>' + event.concise == null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.concise == null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
+    // html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + '<input id="button-select-' + mmdd.replace('/', '-') + '-' + itemNumber + '-' + (((event.makercheckers != null && (event.makercheckers).length > 0)) ? '1' : '0') + '-' + (((event.docs != null && (event.docs).length > 0)) ? '1' : '0') + '-' + event.entityid.replace(/-/g, '_') + '-' + event.locationid.replace(/-/g, '_') + '-' + event.id.replace(/-/g, '_') + '-' + event.duedate.split('/')[1] + '-' + event.duedate.split('/')[0] + '-' + event.duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '-' + ((event.module ?? false) ? event.module : 'compliance') + '-' + ((event.isbulk == null || event.isbulk == false) ? "" : "bulk") + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? "reportformat" : "") + '" class="button-select mr-10 ' + (((event.reportformat != null && event.reportformat.length > 0) || (event.isbulk != null && event.isbulk == true) || (event.customreporting != null)) ? 'hide' : '') + '" type="checkbox"/>' + (event.isbulk != null && event.isbulk == true ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : '') + '<sf-i-elastic-text exportparts="highlight,highlight-count" class="stream-event-title' + (event.isbulk == null || event.isbulk == false ? ' button-event-title' : '') + '" id="stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + itemNumber + '-' + ((event.module ?? false) ? event.module : 'compliance') + '" text="' + event['obligationtitle'] + '" minLength="' + (event.concise == null ? "100" : "60") + '"></sf-i-elastic-text>' + event.concise == null ? ('') : ('<div part="stream-event-location" class="stream-event-location ml-5">' + event.locationname.replace(/ *\([^)]*\) */g, "") + '</div><div part="stream-event-risk-' + event.risk[0].toLowerCase().replace(/ /g, '-') + '" class="stream-event-risk ml-5">' + event.risk[0] + '</div>') + (((event.reportformat != null && event.reportformat.length > 0) || (event.customreporting != null)) ? '' : ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + itemNumber + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>')) + ((event.concise == null && lastUpdated.length > 0) ? ('&nbsp;&nbsp;<div part="event-last-updated-time" class="d-flex align-center">' + lastUpdated + '</div>') : "") + '</div>';
 
     const isBulk = event.isbulk === true;
     const hasReportFormat = event.reportformat?.length > 0;
@@ -4797,7 +4801,7 @@ export class SfIEvents extends LitElement {
         />
         ${isBulk ? '<div class="lds-dual-ring1 bulk-loader mr-10"></div>' : ''}
         ${isReportedLocation ? '<div class="material-symbols-outlined mr-10">arrow_or_edge</div>' : ''}
-        <sf-i-elastic-text 
+        <sf-i-elastic-text exportparts="highlight,highlight-count" 
           class="stream-event-title${!isBulk ? ' button-event-title' : ''}" 
           id="stream-event-title-${mmddSanitized}-${itemNumber}-${moduleType}-${(isReportedLocation) ? 'reportedlocations' : ''}" 
           text="${event.obligationtitle}" 
@@ -4975,13 +4979,13 @@ export class SfIEvents extends LitElement {
     html += this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i);
     html += '</td>';
     if (event["locationname"] != null) {
-      html += '<td part="td-body"><sf-i-elastic-text text="' + event["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="10"></sf-i-elastic-text></td>';
+      html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + event["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="10"></sf-i-elastic-text></td>';
     }
     if (event["entityname"] != null) {
-      html += '<td part="td-body"><sf-i-elastic-text text="' + event["entityname"].replace(/ *\([^)]*\) */g, "") + '" minLength="10"></sf-i-elastic-text></td>';
+      html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + event["entityname"].replace(/ *\([^)]*\) */g, "") + '" minLength="10"></sf-i-elastic-text></td>';
     }
     if (event["countryname"] != null) {
-      html += '<td part="td-body"><sf-i-elastic-text text="' + event["countryname"].replace(/ *\([^)]*\) */g, "") + '" minLength="10"></sf-i-elastic-text></td>';
+      html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + event["countryname"].replace(/ *\([^)]*\) */g, "") + '" minLength="10"></sf-i-elastic-text></td>';
     }
     if (event["functions"] != null) {
       var functions = '';
@@ -4989,7 +4993,7 @@ export class SfIEvents extends LitElement {
         functions += (element.split(';')[0].replace(/ *\([^)]*\) */g, "") + ",");
       }
       functions = functions.replace(/,\s*$/, "");
-      html += '<td part="td-body"><sf-i-elastic-text text="' + functions + '" minLength="10"></sf-i-elastic-text></td>';
+      html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + functions + '" minLength="10"></sf-i-elastic-text></td>';
     }
     if (event["risk"] != null) {
       html += '<td part="td-body"><div part="nc-stream-event-risk-' + event["risk"][0].toLowerCase().replace(/ /g, '-') + '">' + event["risk"][0] + '</div></td>';
@@ -5001,7 +5005,7 @@ export class SfIEvents extends LitElement {
         if (event[Object.keys(event)[k]].indexOf("[") >= 0) {
           html += this.getEventTexts(Object.keys(event)[k], JSON.parse(event[Object.keys(event)[k]]), event);
         } else {
-          html += ' <sf-i-elastic-text text="' + event[Object.keys(event)[k]].replace(/"/g, "") + '" minLength="20"></sf-i-elastic-text>';
+          html += ' <sf-i-elastic-text exportparts="highlight,highlight-count" text="' + event[Object.keys(event)[k]].replace(/"/g, "") + '" minLength="20"></sf-i-elastic-text>';
         }
         html += '</td>';
 
@@ -5153,7 +5157,7 @@ export class SfIEvents extends LitElement {
 
     let graphParam = this.getGraphParam(event);
     // console.log("graphParam", graphParam.split(';')[0]);
-    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
+    html += '<div class="d-flex align-center event-user-labels-container"><div part="badge-filter-name" class="graphparamname graphparamname1 mb-20' + (event.concise == null ? "" : ' hide') + '">' + graphParam.split(';')[0] + '</div>' + reporterStr + approverStr + ((event.concise == null && ((event.reportformat == null || event.reportformat.length == 0) && (event.customreporting == null) && (event.reportedlocationsflag != true))) ? ('<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 mb-20 button-list-reporting">edit_note</button>') : '') + '</div>';
     // }
 
     return html;
@@ -5481,9 +5485,9 @@ export class SfIEvents extends LitElement {
                 + '</tr>');
             }
             if (this.selectedFeatures.indexOf('contracts') >= 0) {
-              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                 + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">');
 
               for (let document of this.events[mmdd][j].contractdocuments ?? []) {
@@ -5491,9 +5495,9 @@ export class SfIEvents extends LitElement {
               }
               htmlSummaryValues += '</td></tr>'
             } else if (this.selectedFeatures.indexOf('licenses') >= 0) {
-              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                 + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">');
 
               for (let document of this.events[mmdd][j].licensedocuments ?? []) {
@@ -5501,15 +5505,15 @@ export class SfIEvents extends LitElement {
               }
               htmlSummaryValues += '</td></tr>'
             } else if (this.selectedFeatures.indexOf('rcmresources') >= 0) {
-              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["url"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td></tr>')
+              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["url"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td></tr>')
             } else {
-              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
-                // + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.events[mmdd][j]["obligation"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
-                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+              htmlSummaryValues += ('<tr><td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-thin"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["id"] + '" minLength="10"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["obligationtitle"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                // + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.events[mmdd][j]["obligation"] + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
+                + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.renderStatusString(partStatus, lateStatus, complianceStatus) + '" minLength="100" lineSize="4"></sf-i-elastic-text></td>'
                 + '<td class="' + (total % 2 === 0 ? 'td-odd' : 'td-even') + ' td-wide">');
 
               for (let document of this.events[mmdd][j].documents) {
@@ -5986,7 +5990,7 @@ export class SfIEvents extends LitElement {
           } else if (uploadGuidance != 0) {
             html += '<div part="upload-guidance-content">'
             html += '<div part="detail-head" class="mb-5"><strong>Upload Guidance</strong></div>'
-            html += '<sf-i-elastic-text text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
+            html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['uploadguidance'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="150"></sf-i-elastic-text>';
             html += '</div>'
           }
           html += '<div part="uploader-analysis-message" class="uploader-analysis-message mt-20">The analysis is running in the background. You can proceed further.</div>'
@@ -6112,8 +6116,8 @@ export class SfIEvents extends LitElement {
     const j = idArr[5];
     let buttonListReportings = eventsContainer.querySelectorAll('.button-list-reporting') as NodeListOf<HTMLButtonElement>
     for (let buttonListReporting of buttonListReportings) {
-      // console.log('buttonListReporting', buttonListReporting.id, 'button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j);
-      if (buttonListReporting.id == 'button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j) {
+      if (buttonListReporting.id == 'button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j + '-') {
+        console.log('buttonListReporting', buttonListReporting.id, 'button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j + '-');
         buttonListReporting.setAttribute('part', 'button-list-reporting-selected')
       } else {
         buttonListReporting.setAttribute('part', 'button-list-reporting')
@@ -6234,7 +6238,7 @@ export class SfIEvents extends LitElement {
           }
           if ((percentage != null && parseInt(percentage) == 0) || event.docsOptional.length > 0) {
             (listReportingContainer.querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents';
-          }else{
+          } else {
             (listReportingContainer.querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents*';
           }
         }, 200);
@@ -6544,9 +6548,29 @@ export class SfIEvents extends LitElement {
               //console.log('reporter comments 2', reportercomments);
 
               // if(docsOptional.length === 0) {
+              let percentage: string = "100";
+              if ((listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
+                percentage = (listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
               docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
               // }
-
+              let flag = false;
+              do {
+                if (docs.length > 0 && event.docsOptional != null && event.docsOptional.length === 0 && parseInt(percentage) > 0) {
+                  for (let doc of docs) {
+                    if ((doc.jobId == null || doc.jobId.length === 0) && (doc.ext.toLowerCase() == 'pdf' || doc.ext.toLowerCase() == 'png' || doc.ext.toLowerCase() == 'jpeg' || doc.ext.toLowerCase() == 'jpg')) {
+                      flag = false
+                    } else {
+                      flag = true;
+                    }
+                  }
+                }
+                if (flag === false) {
+                  await this.sleep(1000);
+                  console.log('waiting for docs', docs);
+                  docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+                }
+              } while (flag === false);
               //console.log('docs', docs);
               let reportformatvalues: string = "";
               let reportformatschema: string = "";
@@ -6554,10 +6578,7 @@ export class SfIEvents extends LitElement {
                 reportformatvalues = JSON.stringify((this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.selectedValues()) ?? "";
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
-              let percentage: string = "100";
-              if ((listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
-                percentage = (listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement).value
-              }
+
               console.log('percentage', percentage, (listReportingContainer.querySelector('#input-reporter-percentage') as HTMLInputElement).value);
               if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
 
@@ -7244,7 +7265,7 @@ export class SfIEvents extends LitElement {
             let listReportingContainer = eventsContainer.querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLDivElement
             listReportingContainer.style.display = 'none';
             listReportingContainer.innerHTML = '';
-            let buttonListReporting = eventsContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLButtonElement
+            let buttonListReporting = eventsContainer.querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j + '-') as HTMLButtonElement
             buttonListReporting.setAttribute('part', 'button-list-reporting')
             let streamEventTitle = eventsContainer.querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + module) as SfIElasticText
             streamEventTitle.removeAttribute('part')
@@ -7487,7 +7508,7 @@ export class SfIEvents extends LitElement {
     //         html += '<div class="stream-events-container flex-grow">';
     //           html += '<div class="hidden-tags hide">'+JSON.stringify(this.events[mmdd][j]['tags'])+'</div>'
     //           html += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>filtered out</i></th></thead></table></div>'
-    //           html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + ('<input id="button-select-'+mmdd.replace('/', '-')+'-'+j + '-' + (((this.events[mmdd][j].makercheckers != null && (this.events[mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((this.events[mmdd][j].docs != null && (this.events[mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + this.events[mmdd][j].entityid.replace(/-/g, '_') + '-' + this.events[mmdd][j].locationid.replace(/-/g, '_') + '-' + this.events[mmdd][j].id.replace(/-/g, '_') +  '-' + this.events[mmdd][j].duedate.split('/')[1] + '-' + this.events[mmdd][j].duedate.split('/')[0] + '-' + this.events[mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g,'_') +  '" class="button-select mr-10" type="checkbox" />') + '<sf-i-elastic-text text="'+this.events[mmdd][j]['obligationtitle']+'" minLength="100"></sf-i-elastic-text></div>';
+    //           html += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5">' + ('<input id="button-select-'+mmdd.replace('/', '-')+'-'+j + '-' + (((this.events[mmdd][j].makercheckers != null && (this.events[mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((this.events[mmdd][j].docs != null && (this.events[mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + this.events[mmdd][j].entityid.replace(/-/g, '_') + '-' + this.events[mmdd][j].locationid.replace(/-/g, '_') + '-' + this.events[mmdd][j].id.replace(/-/g, '_') +  '-' + this.events[mmdd][j].duedate.split('/')[1] + '-' + this.events[mmdd][j].duedate.split('/')[0] + '-' + this.events[mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g,'_') +  '" class="button-select mr-10" type="checkbox" />') + '<sf-i-elastic-text exportparts="highlight,highlight-count" text="'+this.events[mmdd][j]['obligationtitle']+'" minLength="100"></sf-i-elastic-text></div>';
     //           html += '<table class="stream-events-container-table">';
     //           html += '<thead>';
     //           html += '<th part="td-head">';
@@ -7646,15 +7667,15 @@ export class SfIEvents extends LitElement {
     //           html += '<td id="td-expand-'+i+'" part="td-body">';
     //           html += '<button id="button-unmapped-expand-'+mmdd.replace('/', '-')+'-'+j+'" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>'
     //           html += '</td>';
-    //           html += '<td part="td-body"><sf-i-elastic-text text="'+this.events[mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "")+'" minLength="10"></sf-i-elastic-text></td>';
-    //           html += '<td part="td-body"><sf-i-elastic-text text="'+this.events[mmdd][j]["entityname"].replace(/ *\([^)]*\) */g, "")+'" minLength="10"></sf-i-elastic-text></td>';
-    //           html += '<td part="td-body"><sf-i-elastic-text text="'+this.events[mmdd][j]["countryname"].replace(/ *\([^)]*\) */g, "")+'" minLength="10"></sf-i-elastic-text></td>';
+    //           html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="'+this.events[mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "")+'" minLength="10"></sf-i-elastic-text></td>';
+    //           html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="'+this.events[mmdd][j]["entityname"].replace(/ *\([^)]*\) */g, "")+'" minLength="10"></sf-i-elastic-text></td>';
+    //           html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="'+this.events[mmdd][j]["countryname"].replace(/ *\([^)]*\) */g, "")+'" minLength="10"></sf-i-elastic-text></td>';
     //           var functions = '';
     //           for(const element of this.events[mmdd][j]["functions"])  {
     //             functions += (element.split(';')[0].replace(/ *\([^)]*\) */g, "") + ",");
     //           }
     //           functions = functions.replace(/,\s*$/, "");
-    //           html += '<td part="td-body"><sf-i-elastic-text text="'+functions+'" minLength="10"></sf-i-elastic-text></td>';
+    //           html += '<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="'+functions+'" minLength="10"></sf-i-elastic-text></td>';
     //           for(var k = 0; k < Object.keys(this.events[mmdd][j]).length; k++) {
     //             if(this.getEventPreviewFields().includes(Object.keys(this.events[mmdd][j])[k])) {
 
@@ -7662,7 +7683,7 @@ export class SfIEvents extends LitElement {
     //               if(this.events[mmdd][j][Object.keys(this.events[mmdd][j])[k]].indexOf("[") >= 0) {
     //                 html += this.getEventTexts(Object.keys(this.events[mmdd][j])[k], JSON.parse(this.events[mmdd][j][Object.keys(this.events[mmdd][j])[k]]), this.events[mmdd][j]);
     //               } else {
-    //                 html += ' <sf-i-elastic-text text="'+this.events[mmdd][j][Object.keys(this.events[mmdd][j])[k]].replace(/"/g, "")+'" minLength="20"></sf-i-elastic-text>';
+    //                 html += ' <sf-i-elastic-text exportparts="highlight,highlight-count" text="'+this.events[mmdd][j][Object.keys(this.events[mmdd][j])[k]].replace(/"/g, "")+'" minLength="20"></sf-i-elastic-text>';
     //               }
     //               html += '</td>';
 
@@ -8137,12 +8158,12 @@ export class SfIEvents extends LitElement {
     })
     return [buttonSelectAll, buttonUnselectAll]
   }
-  renderRegisterEvents = (events: any, meta: string = "") => {
+  renderRegisterEvents = (events: any, meta: string = "", searchCountryIndex: number = -1, searchIndex: number = -1, searchVal: string = "") => {
 
     var html = '';
 
     this.csvDataRegisters = '';
-
+    let flagUpdateFilters = Object.keys(this.registerFilters).length == 0;
     html += '<div class="d-flex scroll-x w-100p">';
 
     for (var i = 0; i < Object.keys(events).length; i++) {
@@ -8169,7 +8190,7 @@ export class SfIEvents extends LitElement {
         this.renderRegisterEvents(events);
       });
     }
-
+    this.tablecols = []
     if (this.selectedCountryTab >= 0) {
 
       const index = this.selectedCountryTab;
@@ -8195,36 +8216,78 @@ export class SfIEvents extends LitElement {
           for (var k = 0; k < JSON.parse(objCountry[statute][Object.keys(objCountry[statute])[0]].cols).length; k++) {
             if (!this.EXCLUDE_COLS_FROM_REGS.includes(JSON.parse(objCountry[statute][Object.keys(objCountry[statute])[0]].cols)[k].toLowerCase())) {
               this.csvDataRegisters += ('"' + JSON.parse(objCountry[statute][Object.keys(objCountry[statute])[0]].cols)[k] + '",');
+
               console.log('loggin col', JSON.parse(objCountry[statute][Object.keys(objCountry[statute])[0]].cols)[k])
             }
+
           }
           this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
           this.csvDataRegisters += ('\n');
         }
         html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
+
+        html += '<div class="d-flex align-end">';
+        html += '<div class="title-item-date">';
+        html += '<label part="input-label">Search In Statute</label><br />'
+        html += '<input id="stream-search-statute-' + index + '-' + i + '" class="stream-search-statute" part="input" type="text" value="' + ((searchCountryIndex == index && searchIndex == i) ? searchVal : "") + '"/>'
+        html += '</div>';
+        html += '<div class="title-item-date">';
+        html += '<button id="button-download-statute-' + index + '-' + i + '" part="button" class="button-download-statute d-flex justify-center align-center ml-10"><span class="material-symbols-outlined">download</span>&nbsp;&nbsp;<span>Export</span></button>';
+        html += '</div>';
+        html += '</div>';
         html += '<table>';
-        let tablecols: string[] = []
+        let tableBodyHtml = ''
         for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
+
           const complianceId = Object.keys(objCountry[statute])[j];
           const compliance = objCountry[statute][complianceId];
+          console.log('hidecompliances', compliance.hide, complianceId);
+
           const data = JSON.parse(compliance.data);
           const cols = JSON.parse(compliance.cols);
+          if (!this.tablecols.includes('ID') && !this.EXCLUDE_COLS_FROM_REGS.includes('ID')) {
+            this.tablecols.push('ID')
+          }
+          
           for (let col of cols) {
-            if (!tablecols.includes(col.toLowerCase()) && !this.EXCLUDE_COLS_FROM_REGS.includes(col.toLowerCase())) {
-              tablecols.push(col)
+            if (!this.tablecols.includes(col.toLowerCase()) && !this.EXCLUDE_COLS_FROM_REGS.includes(col.toLowerCase())) {
+              this.tablecols.push(col)
+              if (flagUpdateFilters && this.registerFilters[col] == null) {
+                this.registerFilters[col] = {}
+              }
             }
+
+          }
+          if (compliance.hide != null && compliance.hide == true) {
+            continue;
           }
           this.csvDataRegisters += ('"' + complianceId + '",');
           // html += '<div class="w-100p scroll-x ' + (i != this.selectedRegisterIndex ? 'hide' : '') + ' register-body-' + i + '">';
           // html += '<table>';
-          html += '<tr>';
-          html += ('<td class="td-body left-sticky" part="td-body-register"><button part="button-icon" id="button-icon-country-' + index + '-' + i + '-' + j + '" class="button-icon-country"><span class="material-symbols-outlined">open_in_new</span></button></td>');
-          html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">ID</span><br /><sf-i-elastic-text text="' + complianceId + '" minLength="10" lineSize="4"></sf-i-elastic-text></td>');
+          tableBodyHtml += '<tr>';
+          tableBodyHtml += ('<td class="td-body left-sticky" part="td-body-register"><button part="button-icon" id="button-icon-country-' + index + '-' + i + '-' + j + '" class="button-icon-country"><span class="material-symbols-outlined">open_in_new</span></button></td>');
+          if (flagUpdateFilters) {
+            if (this.registerFilters["ID"] == null) {
+              this.registerFilters["ID"] = {}
+            }
+            this.registerFilters["ID"][complianceId] = true;
+          }
+          tableBodyHtml += ('<td class="td-body" part="td-body-register"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + complianceId + '" highlight="' + searchVal + '" minLength="10" lineSize="4"></sf-i-elastic-text></td>');
+
+          // tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">ID</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + complianceId + '" minLength="10" lineSize="4"></sf-i-elastic-text></td>');
+          let tempCount = 0;
           for (var k = 0; k < cols.length; k++) {
-            if (!this.EXCLUDE_COLS_FROM_REGS.includes(cols[k].toLowerCase())) {
-              html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">' + cols[k] + '</span><br /><sf-i-elastic-text text="' + data[k] + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            if (!this.EXCLUDE_COLS_FROM_REGS.includes(cols[k].toLowerCase()) && this.tablecols.indexOf(cols[k]) == tempCount + 1) {
+              // tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">' + cols[k] + '</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + data[k] + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+              tableBodyHtml += ('<td class="td-body" part="td-body-register"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + data[k] + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
               this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
               // this.csvDataRegisters += ('",');
+              if (flagUpdateFilters) {
+                this.registerFilters[cols[k]][data[k]] = true;
+              }
+              tempCount++;
+            } else {
+              console.log('skipping col', cols[k], this.tablecols.indexOf(cols[k]), k + 1)
             }
           }
           if (compliance['entities'] != null && Array.isArray(compliance['entities'])) {
@@ -8233,7 +8296,16 @@ export class SfIEvents extends LitElement {
               entities += entity.split(';')[0].replace(/\([^)]*\)/g, "") + ','
             }
             entities = entities.slice(0, entities.length - 1)
-            html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">entities</span><br /><sf-i-elastic-text text="' + entities + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">entities</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + entities + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            if (!this.tablecols.includes('entities') && !this.EXCLUDE_COLS_FROM_REGS.includes('entities')) {
+              this.tablecols.push('entities')
+            }
+            if (flagUpdateFilters) {
+              if (this.registerFilters["entities"] == null) {
+                this.registerFilters["entities"] = {}
+              }
+              this.registerFilters["entities"][entities] = true;
+            }
             // this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
           }
           if (compliance['locations'] != null && Array.isArray(compliance['locations'])) {
@@ -8242,16 +8314,48 @@ export class SfIEvents extends LitElement {
               locations += location.split(';')[0].replace(/\([^)]*\)/g, "") + ','
             }
             locations = locations.slice(0, locations.length - 1)
-            html += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">locations</span><br /><sf-i-elastic-text text="' + locations + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            tableBodyHtml += ('<td class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important">locations</span><br /><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + locations + '" highlight="' + searchVal + '" minLength="80" lineSize="4"></sf-i-elastic-text></td>');
+            if (!this.tablecols.includes('locations') && !this.EXCLUDE_COLS_FROM_REGS.includes('locations')) {
+              this.tablecols.push('locations')
+            }
+            if (flagUpdateFilters) {
+              if (this.registerFilters["locations"] == null) {
+                this.registerFilters["locations"] = {}
+              }
+              this.registerFilters["locations"][locations] = true;
+            }
             // this.csvDataRegisters += ('"' + (data[k] + "").replace(/"/g, '') + '",');
           }
           this.csvDataRegisters = this.csvDataRegisters.replace(/,\s*$/, "");
           this.csvDataRegisters += ('\n');
           console.log('enter');
-          html += '</tr>';
+          tableBodyHtml += '</tr>';
           // html += '</table>';
           // html += '</div>';
         }
+        html += '<thead><tr>';
+        html += '<th class="td-body" part="td-body-register"><span part="td-head" style="padding-left: 0px !important"></span></th>'
+
+        for (let colName of this.tablecols) {
+          let allSelected = true;
+          for (let subfilterObj of Object.keys(this.registerFilters[colName] ?? {})) {
+            if (this.registerFilters[colName][subfilterObj] == false) {
+              allSelected = false;
+              break;
+            }
+          }
+          
+          html += '<th class="td-body" part="td-body-register"><div class="d-flex align-start"><span part="' + (allSelected ? 'td-head' : 'td-head-selected') + '" style="padding-left: 0px !important">' + colName + '</span><div class="filter-button-container ml-10"><button part="' + (allSelected ? 'button-icon' : 'button-icon-selected') + '" id="filter-button-' + this.tablecols.indexOf(colName) + '" class="filter-button material-symbols-outlined">filter_list</button>'
+          html += '<div id="filter-list-container-' + this.tablecols.indexOf(colName) + '" class="filter-list-container hide flex-col justify-between align-start p-10" part="filter-list-container" anchor="filter-button">'
+          html += `<div id="filter-label-container-${this.tablecols.indexOf(colName)}" class="filter-label-container d-flex justify-between align-center" part="filter-label-container"><div class="d-flex align-center"><input class="input-select-filter" type="checkbox" ${allSelected ? 'checked' : ''} id="input-select-filter-${this.tablecols.indexOf(colName)}-all" name="features" part="input-select-feature" value="all-${colName}"></input><label class="filter-label" part="filter-label" for="input-select-filter-${this.tablecols.indexOf(colName)}-all">All</label></div><button id="button-submit-filters-${this.tablecols.indexOf(colName)}" part="button-icon-small" class="button-submit-filters material-icons invisible">check</button></div>`
+          for (let [index, filterKey] of Object.keys(this.registerFilters[colName]).entries()) {
+            console.log('rendering filter', filterKey);
+            html += `<div class="filter-input-container d-flex justify-start align-start"><input class="input-select-filter" type="checkbox" ${this.registerFilters[colName][filterKey] == true ? 'checked' : ''} id="input-select-filter-${this.tablecols.indexOf(colName)}-${index}" name="features" part="input-select-feature" value="${filterKey}"></input><label for="input-select-filter-${this.tablecols.indexOf(colName)}-${index}" id="input-select-filter-label-${this.tablecols.indexOf(colName)}-${index}" class="input-select-filter-label"  part="input-select-feature-label">${filterKey}</label></div>`
+          }
+          html += '</div></div></th>'
+        }
+        html += '</tr></thead>';
+        html += tableBodyHtml;
         html += '</table>';
         html += '</div>';
 
@@ -8261,8 +8365,8 @@ export class SfIEvents extends LitElement {
       }
 
       divRegisterList!.innerHTML = html;
-
-      console.log('csvdataregisters', this.csvDataRegisters);
+      console.log('registerFilters', flagUpdateFilters, this.registerFilters);
+      // console.log('csvdataregisters', this.csvDataRegisters);
 
       const arrButtonCountries = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.button-icon-country') as NodeListOf<HTMLButtonElement>;
 
@@ -8322,10 +8426,135 @@ export class SfIEvents extends LitElement {
         });
 
       }
+
+      const arrInputStatuteSearch = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.stream-search-statute') as NodeListOf<HTMLInputElement>;
+      for (i = 0; i < arrInputStatuteSearch.length; i++) {
+        const input = Util.clearListeners(arrInputStatuteSearch[i]);
+        input.addEventListener('change', (e: any) => {
+          const searchedValue = e.currentTarget.value;
+          const countryIndex = e.currentTarget.id.split('-')[3];
+          const searchIndex = e.currentTarget.id.split('-')[4];
+          // const objCountry = events[Object.keys(events)[countryIndex]]
+          // const statute = Object.keys(objCountry)[searchIndex];
+          // for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
+          //   const complianceId = Object.keys(objCountry[statute])[j];
+          //   const compliance = objCountry[statute][complianceId];
+          //   if (JSON.stringify(compliance).toLowerCase().includes(searchedValue.toLowerCase())) {
+          //     events[Object.keys(events)[countryIndex]][statute][complianceId].hide = false;
+          //   } else {
+          //     events[Object.keys(events)[countryIndex]][statute][complianceId].hide = true;
+          //   }
+          // }
+
+          this.processRegisterFilters(events, meta, countryIndex, searchIndex, searchedValue);
+          // this.renderRegisterEvents(events, meta, countryIndex, searchIndex, searchedValue);
+
+        })
+      }
+
+      const arrButtonDownloadStatute = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.button-download-statute') as NodeListOf<HTMLButtonElement>;
+      for (i = 0; i < arrButtonDownloadStatute.length; i++) {
+        const button = Util.clearListeners(arrButtonDownloadStatute[i]);
+        button.addEventListener('click', (e: any) => {
+          const countryIndex = e.currentTarget.id.split('-')[3];
+          const searchIndex = e.currentTarget.id.split('-')[4];
+          const objCountry = events[Object.keys(events)[countryIndex]]
+          const statute = Object.keys(objCountry)[searchIndex];
+          let csvData = '"ID","Country","Entities","Locations","Statute","Reference","Obligation"\n';
+          for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
+            const complianceId = Object.keys(objCountry[statute])[j];
+            const compliance = objCountry[statute][complianceId];
+            console.log('hidecompliances', compliance.hide, complianceId);
+            if (compliance.hide != null && compliance.hide == true) {
+              continue;
+            }
+
+            const data = JSON.parse(compliance.data);
+            const cols = JSON.parse(compliance.cols);
+            csvData += ('"' + complianceId + '",');
+            csvData += ('"' + Object.keys(events)[countryIndex] + '",');
+            csvData += ('"' + (compliance['entities'] != null && Array.isArray(compliance['entities']) ? compliance['entities'].map((e: string) => e.split(';')[0].replace(/\([^)]*\)/g, "")).join(',') : '') + '",');
+            csvData += ('"' + (compliance['locations'] != null && Array.isArray(compliance['locations']) ? compliance['locations'].map((e: string) => e.split(';')[0].replace(/\([^)]*\)/g, "")).join(',') : '') + '",');
+            csvData += ('"' + statute + '",');
+            csvData += ('"' + data[cols.indexOf('reference')] + '",');
+            csvData += ('"' + data[cols.indexOf('obligation')] + '"\n');
+          }
+          console.log('csvData', csvData);
+          const ts = new Date();
+          let fileName = 'register_' + statute.replace(/ /g,'_').slice(0, 25) + '_' + ts + '.xlsx'
+          Util.downloadExcelFromCSV(csvData, fileName, "Register Export", this.projectName);
+        })
+      }
+
+      const arrFilterButtons = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.filter-button') as NodeListOf<HTMLButtonElement>;
+      for (i = 0; i < arrFilterButtons.length; i++) {
+        const button = Util.clearListeners(arrFilterButtons[i]);
+        button.addEventListener('click', (e: any) => {
+          const index = e.currentTarget.id.split('-')[2];
+          let filterListContainer = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#filter-list-container-' + index) as HTMLDivElement;
+          if (filterListContainer != null) {
+            if (filterListContainer.classList.contains('hide')) {
+              filterListContainer.classList.remove('hide');
+            } else {
+              filterListContainer.classList.add('hide');
+            }
+          }
+        })
+      }
+
+      const arrFilterInputs = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.input-select-filter') as NodeListOf<HTMLInputElement>;
+      for (i = 0; i < arrFilterInputs.length; i++) {
+        const input = Util.clearListeners(arrFilterInputs[i]);
+        input.addEventListener('change', (e: any) => {
+          let checked = e.currentTarget.checked;
+          let selectedColIndex = e.currentTarget.id.split('-')[3];
+          let selectedFilterIndex = e.currentTarget.id.split('-')[4];
+          let colName = this.tablecols[selectedColIndex]
+          // for (let [colIndex, colName] of Object.keys(this.registerFilters).entries()) {
+          if (colName != null) {
+            for (let [filterIndex, filterKey] of Object.keys(this.registerFilters[colName]).entries()) {
+              if (filterIndex == parseInt(selectedFilterIndex) || selectedFilterIndex == 'all') {
+                this.registerFilters[colName][filterKey] = checked;
+                console.log('registerFilters entry', this.registerFilters[colName][filterKey], colName, filterKey);
+              }
+              if (selectedFilterIndex == 'all') {
+                ((this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#input-select-filter-' + selectedColIndex + '-' + filterIndex) as HTMLInputElement).checked = checked;
+              }
+            }
+            if (!checked) {
+              ((this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#input-select-filter-' + selectedColIndex + '-all') as HTMLInputElement).checked = checked;
+            }
+            if (selectedFilterIndex == 'all') {
+              for (let [filterIndex, filterKey] of Object.keys(this.registerFilters[colName]).entries()) {
+                ((this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#input-select-filter-' + selectedColIndex + '-' + filterIndex) as HTMLInputElement).checked = checked;
+                console.log('Changing Key', filterKey);
+              }
+            }
+          }
+          // }
+          // this.processRegisterFilters(events, meta, searchCountryIndex, searchIndex, searchVal);
+          const buttonSubmitFilters = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#button-submit-filters-' + selectedColIndex) as HTMLButtonElement
+          if (buttonSubmitFilters != null) {
+            buttonSubmitFilters.style.visibility = 'visible'
+          }
+          console.log('registerFilters applying', colName, selectedFilterIndex, this.tablecols)
+        })
+      }
+
+      const arrButtonSubmitFilters = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelectorAll('.button-submit-filters') as NodeListOf<HTMLButtonElement>;
+      for (i = 0; i < arrButtonSubmitFilters.length; i++) {
+        const button = Util.clearListeners(arrButtonSubmitFilters[i])
+        button.addEventListener('click', (e: any) => {
+          console.log('registerFilters applied', e.currentTarget.id)
+          this.processRegisterFilters(events, meta, searchCountryIndex, searchIndex, searchVal);
+        })
+      }
       const registerStatute = (this._SfRegisterContainer.querySelector('.calendar-right-data-register') as HTMLDivElement).querySelector('#register-statute-' + this.selectedRegisterIndex) as HTMLDivElement;
       if (registerStatute != null) {
         registerStatute.scrollIntoView();
       }
+
+
     } else {
       const index = 0;
       this.selectedCountryTab = index
@@ -8334,6 +8563,47 @@ export class SfIEvents extends LitElement {
 
   }
 
+  processRegisterFilters = (events: any, meta: string = "", searchCountryIndex: number = -1, searchIndex: number = -1, searchVal: string = "") => {
+    if (this.selectedCountryTab >= 0) {
+      const index = this.selectedCountryTab;
+      //console.log('indexclicked', index);
+
+      const objCountry = events[Object.keys(events)[index]];
+      for (var i = 0; i < Object.keys(objCountry).length; i++) {
+
+        const statute = Object.keys(objCountry)[i];
+        for (var j = 0; j < Object.keys(objCountry[statute]).length; j++) {
+          let flagFilter = true;
+          const complianceId = Object.keys(objCountry[statute])[j];
+          events[Object.keys(events)[index]][statute][complianceId].hide = false;
+          if (this.registerFilters['ID'][complianceId] == false) {
+            flagFilter = false;
+            events[Object.keys(events)[index]][statute][complianceId].hide = true;
+          }
+          const compliance = objCountry[statute][complianceId];
+          const data = JSON.parse(compliance.data);
+          const cols = JSON.parse(compliance.cols);
+          for (var k = 0; k < cols.length; k++) {
+            if (this.registerFilters[cols[k]] != null && this.registerFilters[cols[k]][data[k]] == false) {
+              flagFilter = false
+              events[Object.keys(events)[index]][statute][complianceId].hide = true;
+            } else {
+              console.log('notFound', k, this.registerFilters[cols[k]])
+            }
+          }
+          if (JSON.stringify(compliance).toLowerCase().includes(searchVal.toLowerCase())) {
+            if(flagFilter){
+              events[Object.keys(events)[index]][statute][complianceId].hide = false;
+            }
+          } else {
+            events[Object.keys(events)[index]][statute][complianceId].hide = true;
+          }
+        }
+      }
+    }
+
+    this.renderRegisterEvents(events, meta, searchCountryIndex, searchIndex, searchVal);
+  }
   checkStartDateEarliness = (value: string) => {
 
     var startDateCalendar = new Date(this.calendarStartMM + '/' + this.calendarStartDD + '/' + this.calendarStartYYYY);
@@ -8887,7 +9157,7 @@ export class SfIEvents extends LitElement {
               html += ",";
             }
           }
-          divTagsArr[i].innerHTML = '<sf-i-elastic-text text="' + html + '" minLength="20"></sf-i-elastic-text>';
+          divTagsArr[i].innerHTML = '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + html + '" minLength="20"></sf-i-elastic-text>';
           this.mappedValuesTags[i] = value;
         }
         if (param == "users") {
@@ -8904,7 +9174,7 @@ export class SfIEvents extends LitElement {
               html += ",";
             }
           }
-          divUsersArr[i].innerHTML = '<sf-i-elastic-text text="' + html + '" minLength="20"></sf-i-elastic-text>';
+          divUsersArr[i].innerHTML = '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + html + '" minLength="20"></sf-i-elastic-text>';
           this.mappedValuesUsers[i] = value;
           this.updateMappingStatus(value, i);
           this.calculateAndShowSummary();
@@ -10098,7 +10368,7 @@ export class SfIEvents extends LitElement {
         const compliance = adhocQuestions[Object.keys(adhocQuestions)[i]][j];
 
         html += '<tr>';
-        html += ('<td part="td-body"><sf-i-elastic-text text="' + compliance.id + '" minLength="10" lineSize="6"></sf-i-elastic-text></td><td part="td-body"><sf-i-elastic-text text="' + compliance.locationname.replace(/ *\([^)]*\) */g, "").trim() + '" minLength="80" lineSize="6"></sf-i-elastic-text></td><td part="td-body"><sf-i-elastic-text text="' + compliance.obligationtitle.replace(/ *\([^)]*\) */g, "").trim() + '" minLength="80" lineSize="6"></sf-i-elastic-text></td><td part="td-body"><sf-i-elastic-text text="' + compliance.obligation + '" minLength="80" lineSize="6"></sf-i-elastic-text></td>');
+        html += ('<td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + compliance.id + '" minLength="10" lineSize="6"></sf-i-elastic-text></td><td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + compliance.locationname.replace(/ *\([^)]*\) */g, "").trim() + '" minLength="80" lineSize="6"></sf-i-elastic-text></td><td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + compliance.obligationtitle.replace(/ *\([^)]*\) */g, "").trim() + '" minLength="80" lineSize="6"></sf-i-elastic-text></td><td part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + compliance.obligation + '" minLength="80" lineSize="6"></sf-i-elastic-text></td>');
         html += '</tr>'
       }
       html += '</table>'
@@ -10187,10 +10457,10 @@ export class SfIEvents extends LitElement {
 
         html += '<div class="d-flex align-center mt-20">'
         html += '<span class="badge-counter" part="badge-counter">' + (j + 1) + '</span>';
-        html += '<div part="results-title"><sf-i-elastic-text text="' + arrTriggerRemarks[j] + '" minLength="40"></sf-i-elastic-text></div>';
+        html += '<div part="results-title"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + arrTriggerRemarks[j] + '" minLength="40"></sf-i-elastic-text></div>';
         html += '</div>'
         html += '<div part="td-body" class="d-flex align-center">'
-        html += '<div>Trigger Id: </div>&nbsp;&nbsp;<sf-i-elastic-text text="' + arrTriggerIds[j] + '" minLength="10" lineSize="6"></sf-i-elastic-text>&nbsp;&nbsp; <button id="adhoc-delete-start-' + arrTriggerIds[j].replace(/-/g, "_") + '"  class="mr-10 adhoc-delete-start">Retract</button><button id="adhoc-delete-cancel-' + arrTriggerIds[j].replace(/-/g, "_") + '" class="mr-10 hide adhoc-delete-cancel">Cancel</button><button id="adhoc-delete-confirm-' + arrTriggerIds[j].replace(/-/g, "_") + '" class="mr-10 hide adhoc-delete-confirm">Confirm Retract</button>';
+        html += '<div>Trigger Id: </div>&nbsp;&nbsp;<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + arrTriggerIds[j] + '" minLength="10" lineSize="6"></sf-i-elastic-text>&nbsp;&nbsp; <button id="adhoc-delete-start-' + arrTriggerIds[j].replace(/-/g, "_") + '"  class="mr-10 adhoc-delete-start">Retract</button><button id="adhoc-delete-cancel-' + arrTriggerIds[j].replace(/-/g, "_") + '" class="mr-10 hide adhoc-delete-cancel">Cancel</button><button id="adhoc-delete-confirm-' + arrTriggerIds[j].replace(/-/g, "_") + '" class="mr-10 hide adhoc-delete-confirm">Confirm Retract</button>';
         html += '</div>'
 
 
@@ -10204,7 +10474,7 @@ export class SfIEvents extends LitElement {
               const complianceTrigger = Object.keys(arrTriggers[arrTriggerIds[j]][dateTrigger][locationTrigger])[m];
               const dateOccurrence = arrTriggers[arrTriggerIds[j]][dateTrigger][locationTrigger][complianceTrigger];
               html += '<div part="td-head" class="d-flex align-center ml-10">';
-              html += '<div>Occurred on&nbsp;&nbsp;' + dateOccurrence + ',&nbsp;&nbsp;Triggered on&nbsp;&nbsp;' + dateTrigger + '&nbsp;&nbsp;at&nbsp;&nbsp;' + locationTrigger.replace(/ *\([^)]*\) */g, "").trim() + '&nbsp;&nbsp;for Compliance Id&nbsp;&nbsp;</div><sf-i-elastic-text text="' + complianceTrigger + '" minLength="10" lineSize="6"></sf-i-elastic-text>';
+              html += '<div>Occurred on&nbsp;&nbsp;' + dateOccurrence + ',&nbsp;&nbsp;Triggered on&nbsp;&nbsp;' + dateTrigger + '&nbsp;&nbsp;at&nbsp;&nbsp;' + locationTrigger.replace(/ *\([^)]*\) */g, "").trim() + '&nbsp;&nbsp;for Compliance Id&nbsp;&nbsp;</div><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + complianceTrigger + '" minLength="10" lineSize="6"></sf-i-elastic-text>';
               html += '</div>';
             }
 
@@ -11518,7 +11788,7 @@ export class SfIEvents extends LitElement {
           let listReportingContainer = (this._SfThisContainer as HTMLDivElement).querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLDivElement
           listReportingContainer.style.display = 'none';
           listReportingContainer.innerHTML = '';
-          let buttonListReporting = (this._SfThisContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLButtonElement
+          let buttonListReporting = (this._SfThisContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j + '-') as HTMLButtonElement
           buttonListReporting.setAttribute('part', 'button-list-reporting')
           let streamEventTitle = (this._SfThisContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + module) as SfIElasticText
           streamEventTitle.removeAttribute('part')
@@ -12143,7 +12413,7 @@ export class SfIEvents extends LitElement {
           let listReportingContainer = (this._SfStreamContainer as HTMLDivElement).querySelector('#list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLDivElement
           listReportingContainer.style.display = 'none';
           listReportingContainer.innerHTML = '';
-          let buttonListReporting = (this._SfStreamContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j) as HTMLButtonElement
+          let buttonListReporting = (this._SfStreamContainer as HTMLDivElement).querySelector('#button-list-reporting-' + mmdd.replace(/\//g, '-') + '-' + j + '-') as HTMLButtonElement
           buttonListReporting.setAttribute('part', 'button-list-reporting')
           let streamEventTitle = (this._SfStreamContainer as HTMLDivElement).querySelector('#stream-event-title-' + mmdd.replace(/\//g, '-') + '-' + j + '-' + module) as SfIElasticText
           streamEventTitle.removeAttribute('part')
@@ -13292,7 +13562,7 @@ export class SfIEvents extends LitElement {
 
         html += '<div class="m-20">';
         html += '<div part="detail-head"><strong>' + cols[k] + '</strong></div>'
-        html += '<sf-i-elastic-text text="' + data[k] + '" minLength="80" lineSize="6"></sf-i-elastic-text>';
+        html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + data[k] + '" minLength="80" lineSize="6"></sf-i-elastic-text>';
         html += '</div>';
 
       }
@@ -13520,7 +13790,7 @@ export class SfIEvents extends LitElement {
           for (var j = 0; j < Object.keys(jsonComments).length; j++) {
             htmlTable += '<div class="mb-20">';
             htmlTable += ('<div part="detail-head">' + Object.keys(jsonComments)[j] + '</div>');
-            htmlTable += ('<sf-i-elastic-text text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
+            htmlTable += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
             htmlTable += '</div>';
           }
           html += '<div class="">' + htmlTable + '<small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
@@ -13939,11 +14209,30 @@ export class SfIEvents extends LitElement {
               let docs: any[] = [];
 
               //console.log('reporter comments 2', reportercomments);
-
+              let percentage: string = "100";
+              if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
+                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
               // if(docsOptional.length === 0) {
               docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
               // }
-
+              let flag = false;
+              do {
+                if (docs.length > 0 && docsOptional != null && docsOptional.length === 0 && parseInt(percentage) > 0) {
+                  for (let doc of docs) {
+                    if ((doc.jobId == null || doc.jobId.length === 0) && (doc.ext.toLowerCase() == 'pdf' || doc.ext.toLowerCase() == 'png' || doc.ext.toLowerCase() == 'jpeg' || doc.ext.toLowerCase() == 'jpg')) {
+                      flag = false
+                    } else {
+                      flag = true;
+                    }
+                  }
+                }
+                if (flag === false) {
+                  await this.sleep(1000);
+                  console.log('waiting for docs', docs);
+                  docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+                }
+              } while (flag === false);
               //console.log('docs', docs);
               let reportformatvalues: string = "";
               let reportformatschema: string = "";
@@ -13952,10 +14241,7 @@ export class SfIEvents extends LitElement {
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
 
-              let percentage: string = "100";
-              if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
-                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
-              }
+
               if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
 
                 //console.log('reporter comments 3', reportercomments);
@@ -14391,7 +14677,7 @@ export class SfIEvents extends LitElement {
           for (var j = 0; j < Object.keys(jsonComments).length; j++) {
             htmlTable += '<div class="mb-20">';
             htmlTable += ('<div part="detail-head">' + Object.keys(jsonComments)[j] + '</div>');
-            htmlTable += ('<sf-i-elastic-text text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
+            htmlTable += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
             htmlTable += '</div>';
           }
           html += '<div class="">' + htmlTable + '<small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
@@ -15287,7 +15573,7 @@ export class SfIEvents extends LitElement {
           for (var j = 0; j < Object.keys(jsonComments).length; j++) {
             htmlTable += '<div class="mb-20">';
             htmlTable += ('<div part="detail-head">' + Object.keys(jsonComments)[j] + '</div>');
-            htmlTable += ('<sf-i-elastic-text text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
+            htmlTable += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
             htmlTable += '</div>';
           }
           html += '<div class="">' + htmlTable + '<small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
@@ -16184,7 +16470,7 @@ export class SfIEvents extends LitElement {
           for (var j = 0; j < Object.keys(jsonComments).length; j++) {
             htmlTable += '<div class="mb-20">';
             htmlTable += ('<div part="detail-head">' + Object.keys(jsonComments)[j] + '</div>');
-            htmlTable += ('<sf-i-elastic-text text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
+            htmlTable += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
             htmlTable += '</div>';
           }
           html += '<div class="">' + htmlTable + '<small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
@@ -17034,7 +17320,7 @@ export class SfIEvents extends LitElement {
   renderEventDetail = (event: any, mmddyyyy: any, currentColumnButton: HTMLButtonElement | null, eventsContainer: HTMLDivElement) => {
     console.log('event details', event, mmddyyyy, currentColumnButton == null ? "null currentColumnButton" : currentColumnButton.id);
 
-    let comments, docs, approved, /*dateOfCompletion,*/ makercheckers: Array<string>, docsOptional, documentType;
+    let comments, docs, approved, /*dateOfCompletion,*/ makercheckers: Array<string>, docsOptional: boolean | any, documentType: string | any;
     let entityId: string = "";
     let locationId: string = "";
     let statuteName: string = "";
@@ -17108,9 +17394,9 @@ export class SfIEvents extends LitElement {
     html += ('<div part="detail-summary-subtitle" class="pl-20 pr-20"><h3>' + obligationArr[0].replace(/\n/g, '<br />') + '</h3></div>');
     if (obligationArr.length > 1) {
       let tempObligationArr = obligationArr.slice(1);
-      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+      html += ('<div part="detail-summary-subtitle-more-info" class="pl-20 pr-20 pb-10">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="More information:' + (tempObligationArr.join('')).replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     }
-    html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
+    html += ('<div part="detail-summary-content" class="pl-20 pr-20 pt-20">' + ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event['internalcontrols'] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>') + '</div>');
     html += '</div>';
 
     html += '<br />';
@@ -17137,7 +17423,7 @@ export class SfIEvents extends LitElement {
           } else {
             html += '<div class="m-20">';
             html += '<div part="detail-head"><strong>' + basicFields[i] + '</strong></div>'
-            html += '<sf-i-elastic-text text="' + (event[basicFields[i]] + "").replace(/"/g, "").replace(/ *\([^)]*\) */g, "").trim().split(';')[0] + '" minLength="80"></sf-i-elastic-text>';
+            html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[basicFields[i]] + "").replace(/"/g, "").replace(/ *\([^)]*\) */g, "").trim().split(';')[0] + '" minLength="80"></sf-i-elastic-text>';
             html += '</div>';
           }
 
@@ -17203,7 +17489,7 @@ export class SfIEvents extends LitElement {
             if ((event[statuteFields[i]] + "").indexOf("[") >= 0) {
               html += this.getEventTexts(statuteFields[i], JSON.parse(event[statuteFields[i]]), event);
             } else {
-              html += '<sf-i-elastic-text text="' + (event[statuteFields[i]] + "").replace(/"/g, "") + '" minLength="80"></sf-i-elastic-text>';
+              html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[statuteFields[i]] + "").replace(/"/g, "") + '" minLength="80"></sf-i-elastic-text>';
             }
             html += '</div>';
 
@@ -17242,7 +17528,7 @@ export class SfIEvents extends LitElement {
               if ((event[complianceFields[i]] + "").indexOf("[") >= 0) {
                 html += this.getEventTexts(complianceFields[i], JSON.parse(event[complianceFields[i]]), event) + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
               } else {
-                html += '<sf-i-elastic-text text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>' + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
+                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>' + "&nbsp;<a href=\"" + res + "\" target=\"_blank\">Open</a>";
               }
               html += '</div>';
 
@@ -17270,7 +17556,7 @@ export class SfIEvents extends LitElement {
               if ((event[complianceFields[i]] + "").indexOf("[") >= 0) {
                 html += this.getEventTexts(complianceFields[i], JSON.parse(event[complianceFields[i]]), event);
               } else {
-                html += '<sf-i-elastic-text text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
+                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[complianceFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
               }
               html += '</div>';
 
@@ -17313,7 +17599,7 @@ export class SfIEvents extends LitElement {
                 html += this.getEventTexts(grcFields[i], JSON.parse(event[grcFields[i]]), event);
               } else {
                 //console.log('grcfield', event[grcFields[i]]);
-                html += '<sf-i-elastic-text text="' + (event[grcFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
+                html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + (event[grcFields[i]] + "").replace(/"/g, "").replace(/\n/g, '<br />') + '" minLength="80"></sf-i-elastic-text>';
               }
             }
 
@@ -17387,7 +17673,7 @@ export class SfIEvents extends LitElement {
             for (var j = 0; j < Object.keys(jsonComments).length; j++) {
               htmlTable += '<div class="mb-20">';
               htmlTable += ('<div part="detail-head">' + Object.keys(jsonComments)[j] + '</div>');
-              htmlTable += ('<sf-i-elastic-text text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
+              htmlTable += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + jsonComments[Object.keys(jsonComments)[j]] + '" minLength="20"></sf-i-elastic-text>');
               htmlTable += '</div>';
             }
             html += '<div class="">' + htmlTable + '<small><span class="muted">' + Util.getDateTimeStrings(new Date(comments[i].timestamp).getTime()) + '</span></small></div>';
@@ -17427,7 +17713,7 @@ export class SfIEvents extends LitElement {
 
             html += '<td part="td-body-register">';
             html += ('<span part="td-head" style="padding-left: 0px !important">' + Object.keys(jsonReportEvent)[i] + '</span>');
-            html += ('<span part="td-body"><sf-i-elastic-text text="' + jsonReportEvent[Object.keys(jsonReportEvent)[i]] + '" lineSize="4" minLength="60"></sf-i-elastic-text>' + '</span>');
+            html += ('<span part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + jsonReportEvent[Object.keys(jsonReportEvent)[i]] + '" lineSize="4" minLength="60"></sf-i-elastic-text>' + '</span>');
             html += '</td>';
 
           }
@@ -17728,7 +18014,7 @@ export class SfIEvents extends LitElement {
           }
           if ((percentage != null && parseInt(percentage) == 0) || docsOptional.length > 0) {
             ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents';
-          }else{
+          } else {
             ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-label-docs') as HTMLLabelElement).innerHTML = 'Supporting Documents*';
           }
         }, 200);
@@ -18081,11 +18367,30 @@ export class SfIEvents extends LitElement {
               let docs: any[] = [];
 
               //console.log('reporter comments 2', reportercomments);
-
+              let percentage: string = "100";
+              if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
+                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
+              }
               // if(docsOptional.length === 0) {
               docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
               // }
-
+              let flag = false;
+              do {
+                if (docs.length > 0 && docsOptional != null && docsOptional.length === 0 && parseInt(percentage) > 0) {
+                  for (let doc of docs) {
+                    if ((doc.jobId == null || doc.jobId.length === 0) && (doc.ext.toLowerCase() == 'pdf' || doc.ext.toLowerCase() == 'png' || doc.ext.toLowerCase() == 'jpeg' || doc.ext.toLowerCase() == 'jpg')) {
+                      flag = false
+                    } else {
+                      flag = true;
+                    }
+                  }
+                }
+                if (flag === false) {
+                  await this.sleep(1000);
+                  console.log('waiting for docs', docs);
+                  docs = (this._SfUploader[0].querySelector('#uploader') as SfIUploader)!.selectedValues();
+                }
+              } while (flag === false);
               //console.log('docs', docs);
               let reportformatvalues: string = "";
               let reportformatschema: string = "";
@@ -18094,10 +18399,7 @@ export class SfIEvents extends LitElement {
                 reportformatschema = (this._SfReporting[0].querySelector('#reporting-format') as SfIReporting)!.configjson ?? "";
               }
 
-              let percentage: string = "100";
-              if (((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement) != null) {
-                percentage = ((this._SfDetailContainer as HTMLDivElement).querySelector('#input-reporter-percentage') as HTMLInputElement).value
-              }
+
               if (Number.isNaN(parseInt(percentage)) || parseInt(percentage) < 0 || parseInt(percentage) > 100) {
 
                 //console.log('reporter comments 3', reportercomments);
@@ -19350,7 +19652,7 @@ export class SfIEvents extends LitElement {
         //     }, 20000);
 
         //   } else {
-        //     html += '<sf-i-elastic-text text="'+JSON.stringify(arrFeedbackReference[JSON.parse(sourceArray.data.mappings.mappings[i].data)[1][0].trim()][JSON.parse(sourceArray.data.mappings.mappings[i].data)[6][0].trim().replace(/&amp;/g, "&")]).replace(/"/g,"").replace(/\\n/g,"").replace(/{/g,"").replace(/}/g,"").replace(/\\/g,"")+'" lineSize="4" minLength="60"></sf-i-elastic-text>';
+        //     html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="'+JSON.stringify(arrFeedbackReference[JSON.parse(sourceArray.data.mappings.mappings[i].data)[1][0].trim()][JSON.parse(sourceArray.data.mappings.mappings[i].data)[6][0].trim().replace(/&amp;/g, "&")]).replace(/"/g,"").replace(/\\n/g,"").replace(/{/g,"").replace(/}/g,"").replace(/\\/g,"")+'" lineSize="4" minLength="60"></sf-i-elastic-text>';
         //   }
 
         //   html += '</div>';
@@ -19361,7 +19663,7 @@ export class SfIEvents extends LitElement {
           // console.log('uniqcolval', uniqCols[l], sourceArray.data.mappings.mappings[i], sourceArray.data.mappings.mappings[i][uniqCols[l]]);
           html += '<td class="td-body ' + classBg + '" part="td-key">'
           html += '<div class="' + (!showSearch ? 'truncate' : '') + '">';
-          html += '<sf-i-elastic-text text="' + sourceArray.data.mappings.mappings[i][uniqCols[l]].replace(/ *\([^)]*\) */g, "") + '" minLength="20"></sf-i-elastic-text>';
+          html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + sourceArray.data.mappings.mappings[i][uniqCols[l]].replace(/ *\([^)]*\) */g, "") + '" minLength="20"></sf-i-elastic-text>';
           html += '</div>';
           html += '</td>'
         }
@@ -19405,11 +19707,11 @@ export class SfIEvents extends LitElement {
                 if (Array.isArray(JSON.parse(sourceArray.data.mappings.mappings[i].data)[j])) {
 
                   for (var k = 0; k < JSON.parse(sourceArray.data.mappings.mappings[i].data)[j].length; k++) {
-                    html += ('<sf-i-elastic-text text="' + JSON.parse(sourceArray.data.mappings.mappings[i].data)[j][k] + '" minLength="100" lineSize="4"></sf-i-elastic-text>');
+                    html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(sourceArray.data.mappings.mappings[i].data)[j][k] + '" minLength="100" lineSize="4"></sf-i-elastic-text>');
                   }
 
                 } else {
-                  html += ('<sf-i-elastic-text text="' + JSON.parse(sourceArray.data.mappings.mappings[i].data)[j] + '" minLength="100" lineSize="4"></sf-i-elastic-text>')
+                  html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(sourceArray.data.mappings.mappings[i].data)[j] + '" minLength="100" lineSize="4"></sf-i-elastic-text>')
                 }
 
                 html += '</div>';
@@ -20271,7 +20573,7 @@ export class SfIEvents extends LitElement {
             html += '</td>';
           }
           html += '<td part="td-body">';
-          html += '<sf-i-elastic-text class="statute id-' + i + '" text="' + (jsonData[i].id) + '" minLength="10"></sf-i-elastic-text>';
+          html += '<sf-i-elastic-text exportparts="highlight,highlight-count" class="statute id-' + i + '" text="' + (jsonData[i].id) + '" minLength="10"></sf-i-elastic-text>';
           html += '</td>';
 
           html += '</tr>';
@@ -20471,7 +20773,7 @@ export class SfIEvents extends LitElement {
             html += '</td>';
           }
           html += '<td part="td-body" class="' + classBg + ' ' + (jsonData[i].mapped ? 'chosen' : '') + '">';
-          html += '<div class="' + (!showSearch ? 'truncate' : '') + '"><sf-i-elastic-text class="statute id-' + i + '" text="' + (jsonData[i].id) + '" minLength="10"></sf-i-elastic-text></div>';
+          html += '<div class="' + (!showSearch ? 'truncate' : '') + '"><sf-i-elastic-text exportparts="highlight,highlight-count" class="statute id-' + i + '" text="' + (jsonData[i].id) + '" minLength="10"></sf-i-elastic-text></div>';
           html += '</td>';
           //let data = JSON.parse(jsonData[i].fields.data);
           for (var j = 0; j < JSON.parse(jsonData[i].data.cols).length; j++) {
@@ -20504,15 +20806,15 @@ export class SfIEvents extends LitElement {
 
                 for (var k = 0; k < JSON.parse(jsonData[i].data.data)[j].length; k++) {
 
-                  html += ('<sf-i-elastic-text text="' + JSON.parse(jsonData[i].data.data)[j][k] + '" minLength="80" lineSize="4"></sf-i-elastic-text>');
-                  //console.log('Considering', JSON.parse(jsonData[i].data.cols)[j], jsonData[i].cols, j, JSON.parse(jsonData[i].data.data)[j], '<sf-i-elastic-text text="'+JSON.parse(jsonData[i].data.data)[j][k]+'" minLength="80"></sf-i-elastic-text>');
+                  html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(jsonData[i].data.data)[j][k] + '" minLength="80" lineSize="4"></sf-i-elastic-text>');
+                  //console.log('Considering', JSON.parse(jsonData[i].data.cols)[j], jsonData[i].cols, j, JSON.parse(jsonData[i].data.data)[j], '<sf-i-elastic-text exportparts="highlight,highlight-count" text="'+JSON.parse(jsonData[i].data.data)[j][k]+'" minLength="80"></sf-i-elastic-text>');
 
                 }
 
               } else {
 
-                html += ('<sf-i-elastic-text text="' + JSON.parse(jsonData[i].data.data)[j] + '" minLength="80" lineSize="4"></sf-i-elastic-text>')
-                //console.log('Considering', JSON.parse(jsonData[i].data.cols)[j], jsonData[i].cols, j, JSON.parse(jsonData[i].data.data)[j], '<sf-i-elastic-text text="'+JSON.parse(jsonData[i].data.data)[j]+'" minLength="80"></sf-i-elastic-text>');
+                html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(jsonData[i].data.data)[j] + '" minLength="80" lineSize="4"></sf-i-elastic-text>')
+                //console.log('Considering', JSON.parse(jsonData[i].data.cols)[j], jsonData[i].cols, j, JSON.parse(jsonData[i].data.data)[j], '<sf-i-elastic-text exportparts="highlight,highlight-count" text="'+JSON.parse(jsonData[i].data.data)[j]+'" minLength="80"></sf-i-elastic-text>');
 
               }
 
@@ -20812,7 +21114,7 @@ export class SfIEvents extends LitElement {
                 if (val == '') {
                   val = '-';
                 }
-                html += ('<sf-i-elastic-text text="' + val + '" minLength="80"></sf-i-elastic-text>');
+                html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + val + '" minLength="80"></sf-i-elastic-text>');
 
               }
             }
@@ -20825,7 +21127,7 @@ export class SfIEvents extends LitElement {
             if (val == '') {
               val = '-';
             }
-            html += ('<div part="td-body">' + '<sf-i-elastic-text text="' + val + '" minLength="80"></sf-i-elastic-text>' + '</div><br />')
+            html += ('<div part="td-body">' + '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + val + '" minLength="80"></sf-i-elastic-text>' + '</div><br />')
 
           }
           html += '</div>';
@@ -21814,7 +22116,7 @@ export class SfIEvents extends LitElement {
       if (arrStatus[0].toLowerCase().indexOf('entities') >= 0) {
         (this._SfOnboardingTabContainer as HTMLDivElement).querySelector('#button-status-entities')!.innerHTML = arrStatus[1];
       }
-      if (arrStatus[0].toLowerCase().indexOf('locations') >= 0) {
+      if (arrStatus[0].toLowerCase().indexOf('locations') >= 0 && arrStatus[0].toLowerCase().indexOf('reportedlocations') < 0) {
         (this._SfOnboardingTabContainer as HTMLDivElement).querySelector('#button-status-locations')!.innerHTML = arrStatus[1];
       }
       if (arrStatus[0].toLowerCase().indexOf('functions') >= 0
@@ -22251,7 +22553,7 @@ export class SfIEvents extends LitElement {
 
     html += '<tr>';
     html += '<td part="td-body" class="' + classBg + '">';
-    html += '<sf-i-elastic-text class="statute id-' + i + '" text="' + (this.rcmSelectedCompliance.id) + '" minLength="80"></sf-i-elastic-text>';
+    html += '<sf-i-elastic-text exportparts="highlight,highlight-count" class="statute id-' + i + '" text="' + (this.rcmSelectedCompliance.id) + '" minLength="80"></sf-i-elastic-text>';
     html += '</td>';
     //let data = JSON.parse(jsonData[i].fields.data);
     for (var j = 0; j < Object.keys(this.rcmSelectedCompliance.values).length; j++) {
@@ -22263,9 +22565,9 @@ export class SfIEvents extends LitElement {
 
           for (var k = 0; k < this.rcmSelectedCompliance.values[objectKey].value.length; k++) {
             if (this.rcmSelectedCompliance.values[objectKey].text != null) {
-              html += ('<sf-i-elastic-text text="' + this.rcmSelectedCompliance.values[objectKey].text[k] + '" minLength="80"></sf-i-elastic-text>');
+              html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.rcmSelectedCompliance.values[objectKey].text[k] + '" minLength="80"></sf-i-elastic-text>');
             } else {
-              html += ('<sf-i-elastic-text text="' + this.rcmSelectedCompliance.values[objectKey].value[k] + '" minLength="80"></sf-i-elastic-text>');
+              html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.rcmSelectedCompliance.values[objectKey].value[k] + '" minLength="80"></sf-i-elastic-text>');
             }
 
             if (k < (this.rcmSelectedCompliance.values[objectKey].value.length - 1)) {
@@ -22275,9 +22577,9 @@ export class SfIEvents extends LitElement {
 
         } else {
           if (this.rcmSelectedCompliance.values[objectKey].text != null) {
-            html += ('<sf-i-elastic-text text="' + this.rcmSelectedCompliance.values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
+            html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.rcmSelectedCompliance.values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
           } else {
-            html += ('<sf-i-elastic-text text="' + this.rcmSelectedCompliance.values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
+            html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + this.rcmSelectedCompliance.values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
           }
         }
         html += '</td>';
@@ -22341,7 +22643,7 @@ export class SfIEvents extends LitElement {
       html += '<div class="d-flex"><button id="button-lock-' + (updatedCompliances[i].id) + '" class="mr-10 button-lock-icon button-lock-' + i + '" part="button-icon-small"><span class="material-symbols-outlined">done</span></button></div>';
       html += '</td>';
       html += '<td part="td-body" class="' + classBg + '">';
-      html += '<sf-i-elastic-text class="statute id-' + i + '" text="' + (updatedCompliances[i].id) + '" minLength="80"></sf-i-elastic-text>';
+      html += '<sf-i-elastic-text exportparts="highlight,highlight-count" class="statute id-' + i + '" text="' + (updatedCompliances[i].id) + '" minLength="80"></sf-i-elastic-text>';
       html += '</td>';
       //let data = JSON.parse(jsonData[i].fields.data);
       for (var j = 0; j < Object.keys(updatedCompliances[i].values).length; j++) {
@@ -22353,9 +22655,9 @@ export class SfIEvents extends LitElement {
 
             for (var k = 0; k < updatedCompliances[i].values[objectKey].value.length; k++) {
               if (updatedCompliances[i].values[objectKey].text != null) {
-                html += ('<sf-i-elastic-text text="' + updatedCompliances[i].values[objectKey].text[k] + '" minLength="80"></sf-i-elastic-text>');
+                html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + updatedCompliances[i].values[objectKey].text[k] + '" minLength="80"></sf-i-elastic-text>');
               } else {
-                html += ('<sf-i-elastic-text text="' + updatedCompliances[i].values[objectKey].value[k] + '" minLength="80"></sf-i-elastic-text>');
+                html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + updatedCompliances[i].values[objectKey].value[k] + '" minLength="80"></sf-i-elastic-text>');
               }
 
               if (k < (updatedCompliances[i].values[objectKey].value.length - 1)) {
@@ -22365,9 +22667,9 @@ export class SfIEvents extends LitElement {
 
           } else {
             if (updatedCompliances[i].values[objectKey].text != null) {
-              html += ('<sf-i-elastic-text text="' + updatedCompliances[i].values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
+              html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + updatedCompliances[i].values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
             } else {
-              html += ('<sf-i-elastic-text text="' + updatedCompliances[i].values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
+              html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + updatedCompliances[i].values[objectKey].value + '" minLength="80"></sf-i-elastic-text>')
             }
           }
           html += '</td>';
@@ -22465,7 +22767,7 @@ export class SfIEvents extends LitElement {
       //   html += '<div id="select-'+i+'"><button id="button-'+i+'" class="button-icon button-'+i+'"><span class="material-symbols-outlined">navigate_next</span></button></div>';
       //   html += '</td>';
       html += '<td part="td-body" class="' + classBg + '">';
-      html += '<sf-i-elastic-text class="statute id-' + i + '" text="' + (projects[i].id) + '" minLength="80"></sf-i-elastic-text>';
+      html += '<sf-i-elastic-text exportparts="highlight,highlight-count" class="statute id-' + i + '" text="' + (projects[i].id) + '" minLength="80"></sf-i-elastic-text>';
       html += '</td>';
       //   //let data = JSON.parse(jsonData[i].fields.data);
       for (var j = 0; j < Object.keys(projects[i]).length; j++) {
@@ -22478,12 +22780,12 @@ export class SfIEvents extends LitElement {
           if (Array.isArray(projects[i][objectKey])) {
 
             for (var k = 0; k < projects[i][objectKey].value.length; k++) {
-              html += ('<sf-i-elastic-text text="' + projects[i][objectKey][0] + '" minLength="80"></sf-i-elastic-text>');
+              html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + projects[i][objectKey][0] + '" minLength="80"></sf-i-elastic-text>');
             }
 
           } else {
             //console.log('not array');
-            html += ('<sf-i-elastic-text text="' + projects[i][objectKey].replace(/"/g, '') + '" minLength="80"></sf-i-elastic-text>')
+            html += ('<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + projects[i][objectKey].replace(/"/g, '') + '" minLength="80"></sf-i-elastic-text>')
           }
           html += '</td>';
         }
@@ -25569,7 +25871,7 @@ export class SfIEvents extends LitElement {
         if (events[index][Object.keys(events[index])[k]].indexOf("[") >= 0) {
           html += this.getEventTexts(Object.keys(events[index])[k], JSON.parse(events[index][Object.keys(events[index])[k]]), events[index]);
         } else {
-          html += '<sf-i-elastic-text text="' + events[index][Object.keys(events[index])[k]].replace(/"/g, "") + '" minLength="20"></sf-i-elastic-text>';
+          html += '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + events[index][Object.keys(events[index])[k]].replace(/"/g, "") + '" minLength="20"></sf-i-elastic-text>';
         }
         html += '</td>';
 
@@ -25737,7 +26039,7 @@ export class SfIEvents extends LitElement {
           if (unmappedEvents[i][Object.keys(unmappedEvents[i])[k]].indexOf("[") >= 0) {
             html += this.getEventTexts(Object.keys(unmappedEvents[i])[k], JSON.parse(unmappedEvents[i][Object.keys(unmappedEvents[i])[k]]), unmappedEvents[i]);
           } else {
-            html += ' <sf-i-elastic-text text="' + unmappedEvents[i][Object.keys(unmappedEvents[i])[k]].replace(/"/g, "") + '" minLength="20"></sf-i-elastic-text>';
+            html += ' <sf-i-elastic-text exportparts="highlight,highlight-count" text="' + unmappedEvents[i][Object.keys(unmappedEvents[i])[k]].replace(/"/g, "") + '" minLength="20"></sf-i-elastic-text>';
           }
           html += '</td>';
 
@@ -25837,7 +26139,7 @@ export class SfIEvents extends LitElement {
             html += ",";
           }
         }
-        div.innerHTML = '<sf-i-elastic-text text="' + html + '" minLength="20"></sf-i-elastic-text>';
+        div.innerHTML = '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + html + '" minLength="20"></sf-i-elastic-text>';
         this.mappedValuesTags[clickIndex] = form.selectedValues();
 
         // const div = ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-div-tags-'+clickIndex) as HTMLDivElement);
@@ -25860,7 +26162,7 @@ export class SfIEvents extends LitElement {
             html += ",";
           }
         }
-        div.innerHTML = '<sf-i-elastic-text text="' + html + '" minLength="20"></sf-i-elastic-text>';
+        div.innerHTML = '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + html + '" minLength="20"></sf-i-elastic-text>';
         this.mappedValuesUsers[clickIndex] = form.selectedValues();
         this.updateMappingStatus(form.selectedValues(), clickIndex);
         this.calculateAndShowSummary();
@@ -26068,7 +26370,7 @@ export class SfIEvents extends LitElement {
             html += ',';
           }
         }
-        ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-div-tags-' + i) as HTMLDivElement)!.innerHTML = '<sf-i-elastic-text text="' + html + '" minLength="20"></sf-i-elastic-text>';
+        ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-div-tags-' + i) as HTMLDivElement)!.innerHTML = '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + html + '" minLength="20"></sf-i-elastic-text>';
         ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-input-tags-' + i) as SfIForm)!.preselectedValues = JSON.stringify(this.mappedValuesTags[i]);
         //((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-input-tags-'+i) as SfIForm)!.populatePreselected();
       }
@@ -26082,7 +26384,7 @@ export class SfIEvents extends LitElement {
             html += ',';
           }
         }
-        ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-div-users-' + i) as HTMLDivElement)!.innerHTML = '<sf-i-elastic-text text="' + html + '" minLength="20"></sf-i-elastic-text>';
+        ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-div-users-' + i) as HTMLDivElement)!.innerHTML = '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + html + '" minLength="20"></sf-i-elastic-text>';
         ((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-input-users-' + i) as SfIForm)!.preselectedValues = JSON.stringify(this.mappedValuesUsers[i]);
         //((this._SfMappingContainer as HTMLDivElement).querySelector('#row-unmapped-input-users-'+i) as SfIForm)!.populatePreselected();
       }
@@ -28278,7 +28580,7 @@ export class SfIEvents extends LitElement {
       console.log('jsonRespose', jsonRespose);
       const registers = (await this.fetchPresignedUrl(jsonRespose.signedUrlGet));
       await this.fetchPresignedUrlDelete(jsonRespose.signedUrlDelete)
-
+      this.registerFilters = {};
       // this.renderAppropriateStream(startDate, endDate);
       // const jsonRespose = JSON.parse(xhr.responseText);
       //console.log(jsonRespose);
@@ -29801,11 +30103,11 @@ export class SfIEvents extends LitElement {
           eventHtml += '<div class="stream-events-container flex-grow">';
           eventHtml += '<div class="hidden-tags hide">' + JSON.stringify(eventsData[role][mmdd][j]['tags']) + '</div>'
           eventHtml += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-          eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + (eventsData[role][mmdd][j].isbulk ? ('<div class="lds-dual-ring1 bulk-loader mr-10"></div>') : ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + j + '-' + (((eventsData[role][mmdd][j].makercheckers != null && (eventsData[role][mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((eventsData[role][mmdd][j].docs != null && (eventsData[role][mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + eventsData[role][mmdd][j].entityid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].locationid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].id.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].duedate.split('/')[1] + '-' + eventsData[role][mmdd][j].duedate.split('/')[0] + '-' + eventsData[role][mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((eventsData[role][mmdd][j].reportformat != null && eventsData[role][mmdd][j].reportformat.length > 0) ? 'hide' : '') + '" type="checkbox" />')) + (eventsData[role][mmdd][j].isbulk ? '' : ('<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>')) + '<sf-i-elastic-text text="' + eventsData[role][mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text text="' + eventsData[role][mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i)
+          eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + (eventsData[role][mmdd][j].isbulk ? ('<div class="lds-dual-ring1 bulk-loader mr-10"></div>') : ('<input id="button-select-' + mmdd.replace('/', '-') + '-' + j + '-' + (((eventsData[role][mmdd][j].makercheckers != null && (eventsData[role][mmdd][j].makercheckers).length > 0)) ? '1' : '0') + '-' + (((eventsData[role][mmdd][j].docs != null && (eventsData[role][mmdd][j].docs).length > 0)) ? '1' : '0') + '-' + eventsData[role][mmdd][j].entityid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].locationid.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].id.replace(/-/g, '_') + '-' + eventsData[role][mmdd][j].duedate.split('/')[1] + '-' + eventsData[role][mmdd][j].duedate.split('/')[0] + '-' + eventsData[role][mmdd][j].duedate.split('/')[2] + '-' + partStatus.replace(/-/g, '_') + '" class="button-select mr-10 ' + ((eventsData[role][mmdd][j].reportformat != null && eventsData[role][mmdd][j].reportformat.length > 0) ? 'hide' : '') + '" type="checkbox" />')) + (eventsData[role][mmdd][j].isbulk ? '' : ('<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">open_in_new</button>')) + '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + eventsData[role][mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + eventsData[role][mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i)
 
           console.log('next isBulk', eventsData[role][mmdd][j].isbulk);
           if (eventsData[role][mmdd][j].isbulk == null || eventsData[role][mmdd][j].isbulk == false) {
-            eventHtml += '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>'
+            eventHtml += '<button id="button-list-reporting-' + mmdd.replace('/', '-') + '-' + j + '-" part="button-list-reporting" class="material-icons ml-10 button-list-reporting">edit_note</button>'
             eventHtml += '</div>';
             eventHtml += '<div class="list-reporting-container d-flex flex-col hide" part="list-reporting-container" id="list-reporting-container-' + mmdd.replace(/\//g, '-') + '-' + j + '"></div>'
           }
@@ -30109,7 +30411,7 @@ export class SfIEvents extends LitElement {
 
             html += '<td part="td-body-register">';
             html += ('<span part="td-head" style="padding-left: 0px !important">' + Object.keys(JSON.parse(report['event']))[i] + '</span>');
-            html += ('<span part="td-body"><sf-i-elastic-text text="' + JSON.parse(report['event'])[Object.keys(JSON.parse(report['event']))[i]] + '" lineSize="4" minLength="60"></sf-i-elastic-text>' + '</span>');
+            html += ('<span part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + JSON.parse(report['event'])[Object.keys(JSON.parse(report['event']))[i]] + '" lineSize="4" minLength="60"></sf-i-elastic-text>' + '</span>');
             html += '</td>';
 
           }
@@ -30420,7 +30722,7 @@ export class SfIEvents extends LitElement {
           eventHtml += '<div class="stream-events-container flex-grow">';
           eventHtml += '<div class="hidden-tags hide">' + JSON.stringify(eventsData[mmdd][j]['tags']) + '</div>'
           eventHtml += '<div class="hidden-title hide"><table><thead><th part="badge-filtered"><i>not filtered</i></th></thead></table></div>'
-          eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + '<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">check</button>' + '<sf-i-elastic-text text="' + eventsData[mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text text="' + eventsData[mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i) + '</div>';
+          eventHtml += '<div part="stream-events-event-title" class="stream-events-event-title d-flex align-center pl-5 pb-5 mb-10">' + '<button id="button-unmapped-expand-' + mmdd.replace('/', '-') + '-' + j + '" part="button-icon-small" class="material-icons button-expand mr-10">check</button>' + '<sf-i-elastic-text exportparts="highlight,highlight-count" text="' + eventsData[mmdd][j]['obligationtitle'] + '" minLength="100"></sf-i-elastic-text>&nbsp;&nbsp;' + '<div part="td-body"><sf-i-elastic-text exportparts="highlight,highlight-count" text="' + eventsData[mmdd][j]["locationname"].replace(/ *\([^)]*\) */g, "") + '" minLength="30"></sf-i-elastic-text></div>&nbsp;&nbsp;<div part="upcoming-function">' + functionStr + '</div>&nbsp;&nbsp;' + this.renderStatusHtml(partStatus, lateStatus, complianceStatus, i) + '</div>';
           eventHtml += '</div>';
           html += eventHtml