diff --git a/frontends/dnet-is-application/src/app/app.module.ts b/frontends/dnet-is-application/src/app/app.module.ts
index d285bd2b..fb494434 100644
--- a/frontends/dnet-is-application/src/app/app.module.ts
+++ b/frontends/dnet-is-application/src/app/app.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { FilterPipe } from './pipes/filter.pipe';
+import { FilterPipe } from './common/filter.pipe';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
diff --git a/frontends/dnet-is-application/src/app/pipes/filter.pipe.ts b/frontends/dnet-is-application/src/app/common/filter.pipe.ts
similarity index 88%
rename from frontends/dnet-is-application/src/app/pipes/filter.pipe.ts
rename to frontends/dnet-is-application/src/app/common/filter.pipe.ts
index 9fa31760..fbcc2c95 100644
--- a/frontends/dnet-is-application/src/app/pipes/filter.pipe.ts
+++ b/frontends/dnet-is-application/src/app/common/filter.pipe.ts
@@ -18,7 +18,7 @@ export class FilterPipe implements PipeTransform {
 
     return items.filter(obj => {
       return Object.keys(obj).reduce((acc, curr) => {
-          return acc || String(obj[curr]).toLowerCase().includes(searchText);
+          return acc || JSON.stringify(obj[curr]).toLowerCase().includes(searchText);
       }, false);
     });
   }
diff --git a/frontends/dnet-is-application/src/app/is.model.ts b/frontends/dnet-is-application/src/app/common/is.model.ts
similarity index 100%
rename from frontends/dnet-is-application/src/app/is.model.ts
rename to frontends/dnet-is-application/src/app/common/is.model.ts
diff --git a/frontends/dnet-is-application/src/app/is.service.ts b/frontends/dnet-is-application/src/app/common/is.service.ts
similarity index 100%
rename from frontends/dnet-is-application/src/app/is.service.ts
rename to frontends/dnet-is-application/src/app/common/is.service.ts
diff --git a/frontends/dnet-is-application/src/app/contexts/contexts.component.ts b/frontends/dnet-is-application/src/app/contexts/contexts.component.ts
index 37188d2a..1fc5e41f 100644
--- a/frontends/dnet-is-application/src/app/contexts/contexts.component.ts
+++ b/frontends/dnet-is-application/src/app/contexts/contexts.component.ts
@@ -1,11 +1,10 @@
 import { Component, Inject,AfterViewInit, OnInit, ViewChild } from '@angular/core';
-import { ISService } from '../is.service';
+import { ISService } from '../common/is.service';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatSort } from '@angular/material/sort';
-import { Context, ContextNode } from '../is.model';
+import { Context, ContextParam, ContextNode } from '../common/is.model';
 import { ActivatedRoute, Params } from '@angular/router';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ContextParam } from '../is.model';
 
 @Component({
   selector: 'app-contexts',
diff --git a/frontends/dnet-is-application/src/app/dsm/dsm-results.component.html b/frontends/dnet-is-application/src/app/dsm/dsm-results.component.html
index 2668a6c1..6b2c6855 100644
--- a/frontends/dnet-is-application/src/app/dsm/dsm-results.component.html
+++ b/frontends/dnet-is-application/src/app/dsm/dsm-results.component.html
@@ -74,7 +74,7 @@
                                 </span>
                             </p>
                         </ng-container>
-                        <a mat-raised-button color="primary" [routerLink]="['/dsm/addApi']" [queryParams]="{dsId: r.id, dsName: r.name}">add api</a>
+                        <button mat-raised-button color="primary" [routerLink]="['/dsm/addApi']" [queryParams]="{dsId: r.id, dsName: r.name}">add api</button>
                     </td>
             </tr>
             <tr *ngIf="r.consenttermsofuse">
diff --git a/frontends/dnet-is-application/src/app/dsm/dsm.component.css b/frontends/dnet-is-application/src/app/dsm/dsm.component.css
index ea1bebd9..29425153 100644
--- a/frontends/dnet-is-application/src/app/dsm/dsm.component.css
+++ b/frontends/dnet-is-application/src/app/dsm/dsm.component.css
@@ -15,4 +15,10 @@
 
 .dsm-result-table th {
     width: 20em;
+}
+
+.dsm-result-table td button { 
+    font-size: 0.8em !important;
+    padding: 0 !important;
+    height: 2.5em !important;
 }
\ No newline at end of file
diff --git a/frontends/dnet-is-application/src/app/dsm/dsm.component.ts b/frontends/dnet-is-application/src/app/dsm/dsm.component.ts
index 701f6763..557322e8 100644
--- a/frontends/dnet-is-application/src/app/dsm/dsm.component.ts
+++ b/frontends/dnet-is-application/src/app/dsm/dsm.component.ts
@@ -1,16 +1,14 @@
 import { Component, Inject, OnInit, ViewChild } from '@angular/core';
-import { BrowseTerm, Datasource, KeyValue } from '../is.model';
-import { ISService } from '../is.service';
+import { Page, BrowseTerm, Datasource, KeyValue } from '../common/is.model';
+import { ISService } from '../common/is.service';
 import { ActivatedRoute, Params } from '@angular/router';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MatTableDataSource } from '@angular/material/table';
 import { MatSort } from '@angular/material/sort';
 import { combineLatest } from 'rxjs';
-import { Page } from '../is.model';
 import { Router } from '@angular/router';
 import { PageEvent } from '@angular/material/paginator';
 
-
 @Component({
   selector: 'app-dsm-search',
   templateUrl: './dsm-search.component.html',
diff --git a/frontends/dnet-is-application/src/app/info/info.component.ts b/frontends/dnet-is-application/src/app/info/info.component.ts
index 37fa4280..2af2453d 100644
--- a/frontends/dnet-is-application/src/app/info/info.component.ts
+++ b/frontends/dnet-is-application/src/app/info/info.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ISService } from '../is.service';
+import { ISService } from '../common/is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { Module } from '../is.model';
+import { Module } from '../common/is.model';
 
 export interface KeyValueDatasource {
   name: string;
diff --git a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts
index 06ca8953..a4452d44 100644
--- a/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts
+++ b/frontends/dnet-is-application/src/app/main-menu-panels/main-menu-panels.component.ts
@@ -1,6 +1,6 @@
 import { Component, ViewChild } from '@angular/core';
-import { ResourceType } from '../is.model';
-import { ISService } from '../is.service';
+import { ResourceType } from '../common/is.model';
+import { ISService } from '../common/is.service';
 import { MatAccordion } from '@angular/material/expansion';
 
 
diff --git a/frontends/dnet-is-application/src/app/protocols/protocols.component.ts b/frontends/dnet-is-application/src/app/protocols/protocols.component.ts
index 675a0fb6..b9e7ca17 100644
--- a/frontends/dnet-is-application/src/app/protocols/protocols.component.ts
+++ b/frontends/dnet-is-application/src/app/protocols/protocols.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
-import { ISService } from '../is.service';
+import { ISService } from '../common/is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { Protocol, ProtocolParams } from '../is.model';
+import { Protocol, ProtocolParams } from '../common/is.model';
 
 export interface ProtocolDatasource {
   protocol: string;
diff --git a/frontends/dnet-is-application/src/app/resources/resources.component.ts b/frontends/dnet-is-application/src/app/resources/resources.component.ts
index c499e88d..1f4b93bc 100644
--- a/frontends/dnet-is-application/src/app/resources/resources.component.ts
+++ b/frontends/dnet-is-application/src/app/resources/resources.component.ts
@@ -1,8 +1,8 @@
 import { Component, Inject, OnInit } from '@angular/core';
-import { ISService } from '../is.service';
+import { ISService } from '../common/is.service';
 import { ActivatedRoute } from '@angular/router';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ResourceType, SimpleResource } from '../is.model';
+import { ResourceType, SimpleResource } from '../common/is.model';
 import { FormControl, FormGroup } from '@angular/forms';
 
 @Component({
diff --git a/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts b/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts
index 042678f9..f9bb1aec 100644
--- a/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts
+++ b/frontends/dnet-is-application/src/app/vocabularies/vocabularies.component.ts
@@ -1,11 +1,10 @@
 import { Component, Inject, AfterViewInit, OnInit, ViewChild } from '@angular/core';
-import { ISService } from '../is.service';
+import { ISService } from '../common/is.service';
 import { MatTable, MatTableDataSource } from '@angular/material/table';
 import { MatSort } from '@angular/material/sort';
-import { Vocabulary, VocabularyTermSynonym } from '../is.model';
+import { Vocabulary, VocabularyTerm, VocabularyTermSynonym } from '../common/is.model';
 import { ActivatedRoute } from '@angular/router';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { VocabularyTerm } from '../is.model';
 import { FormControl, FormGroup } from '@angular/forms';
 
 @Component({
diff --git a/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts b/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts
index bad0b50a..165070f3 100644
--- a/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts
+++ b/frontends/dnet-is-application/src/app/wf-history/wf-history.component.ts
@@ -1,12 +1,11 @@
 import { Component, Inject,AfterViewInit, OnInit, ViewChild } from '@angular/core';
-import { ISService } from '../is.service';
+import { ISService } from '../common/is.service';
 import { MatTableDataSource } from '@angular/material/table';
-import { MatSort  } from '@angular/material/sort';
-import { WfHistoryEntry } from '../is.model';
+import { MatSort } from '@angular/material/sort';
+import { WfHistoryEntry, KeyValue } from '../common/is.model';
 import { ActivatedRoute, Params } from '@angular/router';
 import { combineLatest } from 'rxjs';
 import { MatDialog, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { KeyValue } from '../is.model';
 
 @Component({
   selector: 'app-wf-history',