diff --git a/smp-angular/src/app/common/search-table/search-table.component.ts b/smp-angular/src/app/common/search-table/search-table.component.ts
index 7419361c868e280e4ccfbf4a6684a2a26797d559..6cf23ac42838ff5348ea171d02fc49b3b89c0504 100644
--- a/smp-angular/src/app/common/search-table/search-table.component.ts
+++ b/smp-angular/src/app/common/search-table/search-table.component.ts
@@ -86,7 +86,8 @@ export class SearchTableComponent implements OnInit {
       name: 'Index',
       width: 30,
       maxWidth: 80,
-      sortable: false
+      sortable: false,
+      showInitially: false
     };
 
     this.columnActions = {
@@ -102,7 +103,8 @@ export class SearchTableComponent implements OnInit {
       name: 'Upd.',
       width: 40,
       maxWidth: 50,
-      sortable: false
+      sortable: false,
+      showInitially: false
     };
   }
 
@@ -113,24 +115,25 @@ export class SearchTableComponent implements OnInit {
       // prepend columns
       if (!!this.tableRowDetailContainer) {
         console.log("show table row details!")
+        this.columnExpandDetails.showInitially = true
         this.columnPicker.allColumns.unshift(this.columnExpandDetails);
-        this.columnPicker.selectedColumns.unshift(this.columnExpandDetails);
       }
       if (this.showIndexColumn) {
         console.log("show table index!")
+        this.columnIndex.showInitially = true
         this.columnPicker.allColumns.unshift(this.columnIndex);
-        this.columnPicker.selectedColumns.unshift(this.columnIndex);
       }
 
       if (this.showActionButtons) {
         console.log("show action buttons!")
         this.columnActions.showInitially = true
-
         this.columnPicker.allColumns.push(this.columnActions);
-        this.columnPicker.selectedColumns.push(this.columnActions);
       }
+      this.columnPicker.selectedColumns = this.columnPicker.allColumns.filter(col => col.showInitially);
+    } else {
+      console.log("Column picker is not registered for the table!")
     }
-    this.columnPicker.selectedColumns = this.columnPicker.allColumns.filter(col => col.showInitially);
+
   }
 
   getRowClass(row) {
diff --git a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html
index a5c83f5841579ef58e9b37c63a66bbd3d7e3a7e9..744e3dd16b76d2cc48e6e540fabfa16dcf07c1db 100644
--- a/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html
+++ b/smp-angular/src/app/service-group-edit/service-group-details-dialog/service-group-details-dialog.component.html
@@ -23,12 +23,7 @@
         </mat-form-field>
 
         <mat-form-field style="width:100%">
-          <input *ngIf="lookups.cachedApplicationConfig.partyIDSchemeMandatory  else notRequired"
-                 matInput placeholder="Participant scheme" name="participantScheme"
-                 id="participantSchemeMandatory_id"
-                 [formControl]="dialogForm.controls['participantScheme']"
-                 maxlength="255" required>
-          <input #notRequired
+           <input
                  matInput placeholder="Participant scheme" name="participantScheme"
                  id="participantScheme_id"
                  [formControl]="dialogForm.controls['participantScheme']"
diff --git a/smp-angular/src/app/service-group-search/service-group-search.component.ts b/smp-angular/src/app/service-group-search/service-group-search.component.ts
index 908e617dbd701c7d6d058282358505e87f3d04ce..1d893e9d9b5dcfe3822542407916b426ff7ebfe8 100644
--- a/smp-angular/src/app/service-group-search/service-group-search.component.ts
+++ b/smp-angular/src/app/service-group-search/service-group-search.component.ts
@@ -8,7 +8,6 @@ import {HttpClient} from '@angular/common/http';
 import {SmpConstants} from "../smp.constants";
 import {GlobalLookups} from "../common/global-lookups";
 import {SearchTableComponent} from "../common/search-table/search-table.component";
-import {ServiceGroupEditController} from "../service-group-edit/service-group-edit-controller";
 
 @Component({
   moduleId: module.id,
@@ -17,8 +16,8 @@ import {ServiceGroupEditController} from "../service-group-edit/service-group-ed
 })
 export class ServiceGroupSearchComponent implements OnInit, AfterViewInit {
 
-  @ViewChild('rowSMPUrlLinkAction', { static: true }) rowSMPUrlLinkAction: TemplateRef<any>
-  @ViewChild('rowActions', { static: true }) rowActions: TemplateRef<any>;
+  @ViewChild('rowSMPUrlLinkAction', {static: true}) rowSMPUrlLinkAction: TemplateRef<any>
+  @ViewChild('rowActions', {static: true}) rowActions: TemplateRef<any>;
   @ViewChild('searchTable', {static: true}) searchTable: SearchTableComponent;
 
   columnPicker: ColumnPicker = new ColumnPicker();
@@ -78,16 +77,16 @@ export class ServiceGroupSearchComponent implements OnInit, AfterViewInit {
     this.columnPicker.selectedColumns = this.columnPicker.allColumns.filter(col => col.showInitially);
   }
 
-  ngAfterViewInit(): void {
+  ngAfterViewInit() {
     this.searchTable.tableColumnInit();
   }
 
-  createServiceGroupURL(row: any){
-    return encodeURIComponent((!row.participantScheme? '' : row.participantScheme)+'::'+row.participantIdentifier);
+  createServiceGroupURL(row: any) {
+    return encodeURIComponent((!row.participantScheme ? '' : row.participantScheme) + '::' + row.participantIdentifier);
   }
 
-  createServiceMetadataURL(row: any, rowSMD: any){
-    return encodeURIComponent((!row.participantScheme? '': row.participantScheme)+'::'+row.participantIdentifier)+'/services/'+ encodeURIComponent((!rowSMD.documentIdentifierScheme?'':rowSMD.documentIdentifierScheme)+'::'+rowSMD.documentIdentifier);
+  createServiceMetadataURL(row: any, rowSMD: any) {
+    return encodeURIComponent((!row.participantScheme ? '' : row.participantScheme) + '::' + row.participantIdentifier) + '/services/' + encodeURIComponent((!rowSMD.documentIdentifierScheme ? '' : rowSMD.documentIdentifierScheme) + '::' + rowSMD.documentIdentifier);
   }
 
   details(row: any) {
diff --git a/smp-examples/smp-spi-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java b/smp-examples/smp-spi-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java
index 520beb4a85dc3b51b40312a9a88504749b02bbe7..7a11400735821a03161188ab7b288676779a725d 100644
--- a/smp-examples/smp-spi-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java
+++ b/smp-examples/smp-spi-example/src/main/java/eu/europa/ec/smp/spi/ExamplePayloadValidatorSpiImpl.java
@@ -34,6 +34,4 @@ public class ExamplePayloadValidatorSpiImpl implements PayloadValidatorSpi {
             throw new PayloadValidatorSpiException("Can not read payload", e);
         }
     }
-
-    ;
 }
\ No newline at end of file