diff --git a/ui/src/app/dashboard/component/entity-item.component.html b/ui/src/app/dashboard/component/entity-item.component.html
index ed3a6223a..4b48336ca 100644
--- a/ui/src/app/dashboard/component/entity-item.component.html
+++ b/ui/src/app/dashboard/component/entity-item.component.html
@@ -5,7 +5,7 @@
                 <div class="w-10 pr-3 pull-left">
                     <i class="fa fa-fw fa-3x text-primary" [class.fa-caret-right]="!isOpen" [class.fa-caret-down]="isOpen"></i>
                     &nbsp;
-                    <span class="label-icon sr-hidden" [ngSwitch]="entity.type">
+                    <span class="label-icon sr-hidden" [ngSwitch]="entity.kind">
                         <i class="fa fa-fw fa-3x text-info fa-cubes" *ngSwitchCase="types.filter"></i>
                         <i class="fa fa-fw fa-3x text-info fa-cube" *ngSwitchCase="types.provider"></i>
                         <i class="fa fa-fw fa-3x text-info fa-" *ngSwitchDefault></i>
@@ -37,7 +37,7 @@
                 <div class="col-10">
                     <div class="row">
                         <div class="col text-right font-weight-bold" i18n="@@label--service-provider">
-                            {entity.type, select, filter {Filter} provider {Service Provider} other {other}} Name:
+                            {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Name:
                         </div>
                         <div class="col">{{ entity.name }}</div>
                         <div class="col text-right font-weight-bold" i18n="@@label--created-date">Created Date:</div>
@@ -46,11 +46,11 @@
                     </div>
                     <div class="row">
                         <div class="col text-right font-weight-bold" i18n="@@label--service-entity-id">
-                            {entity.type, select, filter {Filter} provider {Service Provider} other {other}} Entity ID:
+                            {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Entity ID:
                         </div>
                         <div class="col">{{ entity.entityId }}</div>
                         <div class="col text-right font-weight-bold" i18n="@@label--service-provider-status">
-                            {entity.type, select, filter {Filter} provider {Service Provider} other {other}} Status:
+                            {entity.kind, select, filter {Filter} provider {Service Provider} other {other}} Status:
                         </div>
                         <div class="col" *ngIf="entity.createdDate">
                             <i class="fa fa-fw" [ngClass]="{
@@ -66,7 +66,7 @@
                     </div>
                 </div>
                 <div class="col-2">
-                    <button *ngIf="!entity.createdDate && entity.type === 'provider'"
+                    <button *ngIf="!entity.createdDate && entity.kind === 'provider'"
                         class="btn btn-link pull-right"
                         (click)="delete.emit(entity)"
                         aria-label="Delete selected service provider">
diff --git a/ui/src/app/dashboard/component/entity-item.component.ts b/ui/src/app/dashboard/component/entity-item.component.ts
index a37f4ae5e..83236f5b4 100644
--- a/ui/src/app/dashboard/component/entity-item.component.ts
+++ b/ui/src/app/dashboard/component/entity-item.component.ts
@@ -1,6 +1,6 @@
 import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter } from '@angular/core';
 
-import { MetadataEntity, DomainTypes } from '../../domain/domain.type';
+import { MetadataEntity, DomainEntityKinds } from '../../domain/domain.type';
 
 @Component({
     selector: 'entity-item',
@@ -10,7 +10,7 @@ import { MetadataEntity, DomainTypes } from '../../domain/domain.type';
 })
 export class EntityItemComponent {
 
-    types = DomainTypes;
+    types = DomainEntityKinds;
 
     @Input() entity: MetadataEntity;
     @Input() isOpen: boolean;
diff --git a/ui/src/app/dashboard/container/dashboard.component.ts b/ui/src/app/dashboard/container/dashboard.component.ts
index 434ab7206..45be4ad4c 100644
--- a/ui/src/app/dashboard/container/dashboard.component.ts
+++ b/ui/src/app/dashboard/container/dashboard.component.ts
@@ -6,10 +6,8 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { MetadataEntity, MetadataProvider, DomainTypes } from '../../domain/domain.type';
-import { Provider } from '../../domain/entity/provider';
+import { MetadataEntity, MetadataProvider, DomainEntityKinds } from '../../domain/domain.type';
 import * as searchActions from '../action/search.action';
-import * as providerActions from '../../domain/action/provider-collection.action';
 import * as draftActions from '../../domain/action/draft-collection.action';
 import * as fromDashboard from '../reducer';
 import { ToggleEntityDisplay } from '../action/dashboard.action';
@@ -35,7 +33,7 @@ export class DashboardComponent implements OnInit {
 
     entitiesOpen$: Observable<{[key: string]: boolean}>;
 
-    filterOptions = ['all', 'filter', 'provider'];
+    filterOptions = ['all', DomainEntityKinds.filter, DomainEntityKinds.provider];
     filtering$: Observable<string>;
     filtering = 'all';
 
@@ -54,6 +52,8 @@ export class DashboardComponent implements OnInit {
         this.total$ = this.providers$.pipe(map(list => list.length));
 
         this.limited$ = this.getPagedProviders(this.page, this.providers$);
+
+        // this.providers$.subscribe(p => console.log(p));
     }
 
     ngOnInit (): void {
@@ -88,7 +88,7 @@ export class DashboardComponent implements OnInit {
     edit(entity: MetadataEntity): void {
         let path = entity.id ? 'edit' : 'wizard',
             id = entity.id ? entity.id : entity.entityId;
-        this.router.navigate([entity.type, id, path]);
+        this.router.navigate([entity.kind, id, path]);
     }
 
     toggleProvider(entity: MetadataEntity): void {
diff --git a/ui/src/app/dashboard/effect/search.effects.ts b/ui/src/app/dashboard/effect/search.effects.ts
index 809ef523b..5eed9710b 100644
--- a/ui/src/app/dashboard/effect/search.effects.ts
+++ b/ui/src/app/dashboard/effect/search.effects.ts
@@ -8,10 +8,9 @@ import * as entitySearch from '../action/search.action';
 import * as fromCollections from '../../domain/reducer';
 import * as fromDashboard from '../reducer';
 import { MetadataProvider } from '../../domain/model/metadata-provider';
-import { EntityDescriptorService } from '../../domain/service/entity-descriptor.service';
 import { Provider } from '../../domain/entity/provider';
-import { Filter } from '../../domain/entity/filter';
-import { MetadataEntity, DomainTypes, MetadataFilter } from '../../domain/domain.type';
+import { MetadataEntity, MetadataFilter } from '../../domain/domain.type';
+import { EntityAttributesFilter } from '../../domain/entity/entity-attributes.filter';
 
 
 @Injectable()
@@ -19,20 +18,19 @@ export class SearchEffects {
     @Effect()
     filter$ = this.actions$.pipe(
         ofType<entitySearch.FilterAction>(entitySearch.ENTITY_FILTER),
-        switchMap(filter => this.performSearch())
+        switchMap(() => this.performSearch())
     );
 
     @Effect()
     search$ = this.actions$.pipe(
         ofType<entitySearch.SearchAction>(entitySearch.ENTITY_SEARCH),
         map(action => action.payload),
-        switchMap(query => this.performSearch())
+        switchMap(() => this.performSearch())
     );
 
     matcher = (value, query) => value ? value.toLocaleLowerCase().match(query.toLocaleLowerCase()) : false;
 
     constructor(
-        private descriptorService: EntityDescriptorService,
         private actions$: Actions,
         private store: Store<fromCollections.CollectionState>
     ) { }
@@ -44,14 +42,14 @@ export class SearchEffects {
                 this.store.select(fromCollections.getAllFilters),
                 (o: any[], p: MetadataProvider[], f: MetadataFilter[]): Array<MetadataEntity> => {
                     return o.concat(
-                        f.map(filter => new Filter(filter)),
+                        f.map(filter => new EntityAttributesFilter(filter)),
                         p.map(provider => new Provider(provider))
                     );
                 }
             ),
             combineLatest(
                 this.store.select(fromDashboard.getFilterType),
-                (entities, type) => type !== 'all' ? entities.filter(e => e.type === type) : entities
+                (entities, kind) => kind !== 'all' ? entities.filter(e => e.kind === kind) : entities
             ),
             combineLatest(
                 this.store.select(fromDashboard.getSearchQuery),
diff --git a/ui/src/app/dashboard/reducer/search.reducer.ts b/ui/src/app/dashboard/reducer/search.reducer.ts
index c2a40cae9..e002cd75d 100644
--- a/ui/src/app/dashboard/reducer/search.reducer.ts
+++ b/ui/src/app/dashboard/reducer/search.reducer.ts
@@ -6,14 +6,14 @@ export interface SearchState {
     entities: (MetadataProvider | MetadataFilter)[];
     loading: boolean;
     query: string;
-    type: string;
+    kind: string;
 }
 
 const initialState: SearchState = {
     entities: [],
     loading: false,
     query: '',
-    type: 'all'
+    kind: 'all'
 };
 
 export function reducer(state = initialState, action: searchActions.Actions): SearchState {
@@ -29,7 +29,7 @@ export function reducer(state = initialState, action: searchActions.Actions): Se
         case searchActions.ENTITY_FILTER: {
             return {
                 ...state,
-                type: action.payload,
+                kind: action.payload,
                 loading: true
             };
         }
@@ -39,7 +39,7 @@ export function reducer(state = initialState, action: searchActions.Actions): Se
                 entities: action.payload,
                 loading: false,
                 query: state.query,
-                type: state.type
+                kind: state.kind
             };
         }
 
@@ -55,4 +55,4 @@ export const getQuery = (state: SearchState) => state.query;
 
 export const getLoading = (state: SearchState) => state.loading;
 
-export const getFilter = (state: SearchState) => state.type;
\ No newline at end of file
+export const getFilter = (state: SearchState) => state.kind;
\ No newline at end of file
diff --git a/ui/src/locale/en.xlf b/ui/src/locale/en.xlf
index d9a7fde09..b6cf63a62 100644
--- a/ui/src/locale/en.xlf
+++ b/ui/src/locale/en.xlf
@@ -1384,24 +1384,24 @@
         </context-group>
       </trans-unit>
       <trans-unit id="label--service-provider" datatype="html">
-        <source><x id="ICU" equiv-text="{entity.type, select, filter {...} provider {...} other {...}}"/> Name:</source>
-        <target><x id="ICU" equiv-text="{entity.type, select, filter {...} provider {...} other {...}}"/> Name:</target>
+        <source><x id="ICU" equiv-text="{entity.kind, select, filter {...} provider {...} other {...}}"/> Name:</source>
+        <target><x id="ICU" equiv-text="{entity.kind, select, filter {...} provider {...} other {...}}"/> Name:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/dashboard/component/provider-item.component.ts</context>
           <context context-type="linenumber">33</context>
         </context-group>
       </trans-unit>
       <trans-unit id="label--service-entity-id" datatype="html">
-        <source><x id="ICU" equiv-text="{entity.type, select, filter {...} provider {...} other {...}}"/> Entity ID:</source>
-        <target><x id="ICU" equiv-text="{entity.type, select, filter {...} provider {...} other {...}}"/> Entity ID:</target>
+        <source><x id="ICU" equiv-text="{entity.kind, select, filter {...} provider {...} other {...}}"/> Entity ID:</source>
+        <target><x id="ICU" equiv-text="{entity.kind, select, filter {...} provider {...} other {...}}"/> Entity ID:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/dashboard/component/provider-item.component.ts</context>
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
       <trans-unit id="label--service-provider-status" datatype="html">
-        <source><x id="ICU" equiv-text="{entity.type, select, filter {...} provider {...} other {...}}"/> Status:</source>
-        <target><x id="ICU" equiv-text="{entity.type, select, filter {...} provider {...} other {...}}"/> Status:</target>
+        <source><x id="ICU" equiv-text="{entity.kind, select, filter {...} provider {...} other {...}}"/> Status:</source>
+        <target><x id="ICU" equiv-text="{entity.kind, select, filter {...} provider {...} other {...}}"/> Status:</target>
         <context-group purpose="location">
           <context context-type="sourcefile">app/dashboard/component/provider-item.component.ts</context>
           <context context-type="linenumber">42</context>