diff --git a/@overflow/discovery/component/search-config.component.html b/@overflow/discovery/component/search-config.component.html
index b66bf19..c2e3211 100644
--- a/@overflow/discovery/component/search-config.component.html
+++ b/@overflow/discovery/component/search-config.component.html
@@ -86,6 +86,7 @@
 
   <div class="ui-g-12 ui-g-nopad">
     <of-service-selector [disabled]="!serviceChecked" (change)="includeServices = $event"></of-service-selector>
+    <!-- <of-meta-service-type-selector [disabled]="!serviceChecked" (change)="includeServices = $event"></of-meta-service-type-selector> -->
   </div>
 
   <div class="ui-g-12" dir="rtl">
diff --git a/@overflow/infra/component/infra-tree.component.html b/@overflow/infra/component/infra-tree.component.html
index a1cdf99..d8e90f6 100644
--- a/@overflow/infra/component/infra-tree.component.html
+++ b/@overflow/infra/component/infra-tree.component.html
@@ -5,14 +5,24 @@
     <!-- ZONE node template -->
     <ng-template let-node pTemplate="ZONE">
       <div (contextmenu)="showContextMenu($event, node)">
-        {{node.label}}
+        <div>
+          {{node.label}}
+        </div>
+        <div>
+          {{node.data.subLabel}}
+        </div>
       </div>
     </ng-template>
 
     <!-- HOST node template -->
     <ng-template let-node pTemplate="HOST">
       <div (contextmenu)="showContextMenu($event, node)">
-        {{node.label}}
+        <div>
+          {{node.label}}
+        </div>
+        <div *ngIf="node.data.subLabel">
+          {{node.data.subLabel}}
+        </div>
       </div>
     </ng-template>
 
diff --git a/@overflow/infra/component/infra-tree.component.ts b/@overflow/infra/component/infra-tree.component.ts
index 73125fe..210eb51 100644
--- a/@overflow/infra/component/infra-tree.component.ts
+++ b/@overflow/infra/component/infra-tree.component.ts
@@ -1,15 +1,13 @@
 import {
   Component, Input, OnChanges, SimpleChanges, OnInit, ViewChild
 } from '@angular/core';
-import { Infra } from '@overflow/commons-typescript/model/infra';
-import { InfraHost as InfraTypeHost } from '@overflow/commons-typescript/model/infra';
-import { InfraService as InfraTypeService } from '@overflow/commons-typescript/model/infra';
+import { InfraService, InfraHost, InfraZone, Infra } from '@overflow/commons-typescript/model/infra';
 import { Observable, of } from 'rxjs';
 import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
 import { TreeNode, MenuItem, ContextMenu } from 'primeng/primeng';
 import { PageParams, Page } from '@overflow/commons-typescript/core/model';
-import { ProbeHost } from '@overflow/commons-typescript';
-import { InfraService } from '../service/infra.service';
+import { ProbeHost, MetaInfraTypeEnum } from '@overflow/commons-typescript';
+import { InfraService as InfraCRUDService } from '../service/infra.service';
 
 @Component({
   selector: 'of-infra-tree',
@@ -36,19 +34,11 @@ export class InfraTreeComponent implements OnInit, OnChanges {
   @ViewChild('cmService') cmService: ContextMenu;
 
   constructor(
-    private infraService: InfraService,
+    private infraService: InfraCRUDService,
   ) {
   }
 
   ngOnInit(): void {
-    this.zoneNode.push({
-      label: this.probeHost.probe.cidr,
-      type: 'ZONE',
-      data: {
-      },
-      children: this.hostNode,
-      expanded: true
-    });
     this.initContextMenu();
   }
 
@@ -73,8 +63,7 @@ export class InfraTreeComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges(changes: SimpleChanges): void {
-    console.log(changes);
-    if (changes['probeHost'].isFirstChange ) {
+    if (changes['probeHost'].isFirstChange) {
       this.zoneNode = [];
       this.hostNode = [];
       this.getInfras();
@@ -111,11 +100,14 @@ export class InfraTreeComponent implements OnInit, OnChanges {
 
   generateTreeData(infras: Infra[]) {
     infras.forEach(infra => {
-      switch (infra.metaInfraType.id) { // TODO: fix to enum
-        case 2: // InfraHost
+      switch (infra.metaInfraType.key) {
+        case MetaInfraTypeEnum.ZONE:
+          this.addZone(infra);
+          break;
+        case MetaInfraTypeEnum.HOST:
           this.addHost(infra);
           break;
-        case 7: // InfraService
+        case MetaInfraTypeEnum.HOST:
           this.addService(infra);
           break;
         default:
@@ -124,19 +116,36 @@ export class InfraTreeComponent implements OnInit, OnChanges {
     });
   }
 
-  addHost(infraHost: InfraTypeHost) {
+  addZone(infraZone: InfraZone) {
+    this.zoneNode.push({
+      label: infraZone.network + '(' + infraZone.iface + ')',
+      type: 'ZONE',
+      data: {
+        target: infraZone,
+        subLabel: 'Something to display'
+      },
+      children: this.hostNode,
+      expanded: true
+    });
+  }
+
+  addHost(infraHost: InfraHost) {
+    let ipAddr = infraHost.infraHostIPs[0].address.split('/')[0];
+    if (infraHost.infraHostOS && infraHost.infraHostOS.name) {
+      ipAddr += '(' + infraHost.infraHostOS.name + ')';
+    }
     this.hostNode.push({
       type: 'HOST',
-      label: infraHost.infraHostIPs[0].address,
+      label: ipAddr,
       data: {
-        target: infraHost
+        target: infraHost,
       },
       expanded: true,
       children: []
     });
   }
 
-  addService(infraService: InfraTypeService) {
+  addService(infraService: InfraService) {
     const idx = this.findHostIndex(infraService);
     if (idx === -1) {
       // this.addHost(infraService.infraHost);
@@ -152,13 +161,16 @@ export class InfraTreeComponent implements OnInit, OnChanges {
     });
   }
 
-  findHostIndex(infraService: InfraTypeService): number {
-    const idx = -1;
+  findHostIndex(infraService: InfraService): number {
+    let idx = -1;
     this.hostNode.forEach((node, index) => {
-      // if (node.data.target.id === infraService.infraHost.id) {
-      //   idx = index;
-      //   return;
-      // }
+      const infraHost: InfraHost = node.data.target;
+      for (const infraHostIP of infraHost.infraHostIPs) {
+        if (infraHostIP.id === infraService.infraHostPort.infraHostIP.id) {
+          idx = index;
+          return;
+        }
+      }
     });
     return idx;
   }
diff --git a/@overflow/meta/component/meta-service-type-selector.component.html b/@overflow/meta/component/meta-service-type-selector.component.html
index b50a77c..bd37ca8 100644
--- a/@overflow/meta/component/meta-service-type-selector.component.html
+++ b/@overflow/meta/component/meta-service-type-selector.component.html
@@ -1,15 +1,27 @@
-<of-error-message [error]="error$ | async" [closable]="false"></of-error-message>
-<of-block-progressbar [target]="content" [pending]="pending$ | async"></of-block-progressbar>
+<div *ngIf="!disabled">
+  <of-error-message [error]="error$ | async" [closable]="false"></of-error-message>
+  <of-block-progressbar [target]="content" [pending]="pending$ | async"></of-block-progressbar>
+  <p-panel #content [showHeader]="false" class="block-panel">
+    <div class="ui-g" dir="rtl">
+      <button pButton type="button" class="ui-button-secondary ui-button-width-fit ui-s-button" label="Unselect All" style="margin-bottom: 3px;"
+        (click)="onUnselectAll()"></button>
+      <button pButton type="button" class="ui-button-secondary ui-button-width-fit ui-s-button" label="Select All" style="margin-bottom: 3px;"
+        (click)="onSelectAll()"></button>
+    </div>
 
-<p-panel *ngIf="probeHost" #content [showHeader]="false" class="block-panel">
-  <div *ngIf="metaTargetServiceTypes" class="ui-width-100-">
-    <p-orderList [value]="metaTargetServiceTypes" metaKeySelection="false" [listStyle]="{'height':'200px'}" [responsive]="true"
-      filterBy="name" (onSelectionChange)="selected.emit($event.value[0])" class="ui_orderlist_controls_none">
-      <ng-template let-service pTemplate="item">
-        <div class="ui-helper-clearfix">
-          <div *ngIf="service.isSupported" style="font-size:14px;margin:0">{{service.name}}</div>
-        </div>
+    <p-table selectionMode="multiple" [scrollable]="true" scrollHeight="200px" [value]="metaCrawlers" [(selection)]="includeServices"
+      dataKey="id" (onRowSelect)="onSelect($event.data)" (onRowUnselect)="onUnselect($event.data)">
+      <ng-template pTemplate="body" let-rowData let-columns="columns">
+        <tr [pSelectableRow]="rowData">
+          <!-- <td>
+                        <p-tableCheckbox [value]="rowData"></p-tableCheckbox>
+                    </td> -->
+          <td>
+            <p-tableCheckbox [value]="rowData"></p-tableCheckbox>
+            {{rowData.name}}
+          </td>
+        </tr>
       </ng-template>
-    </p-orderList>
-  </div>
-</p-panel>
\ No newline at end of file
+    </p-table>
+  </p-panel>
+</div>
\ No newline at end of file
diff --git a/@overflow/meta/component/meta-service-type-selector.component.ts b/@overflow/meta/component/meta-service-type-selector.component.ts
index 4199f71..8bd7149 100644
--- a/@overflow/meta/component/meta-service-type-selector.component.ts
+++ b/@overflow/meta/component/meta-service-type-selector.component.ts
@@ -3,7 +3,6 @@ import { Store, select } from '@ngrx/store';
 import { Observable, of, Subscription } from 'rxjs';
 import { catchError, exhaustMap, map, tap, take } from 'rxjs/operators';
 
-
 import { MetaCrawler, MetaTargetServiceType, MetaInfraTypeEnum, toMetaInfraTypeEnum, toMetaInfraType, MetaTargetType } from '@overflow/commons-typescript/model/meta';
 import { MetaCrawlerService } from '../service/meta-crawler.service';
 import { MetaTargetTypeService } from '../service/meta-target-type.service';
@@ -15,9 +14,12 @@ import { MetaTargetTypeService } from '../service/meta-target-type.service';
 })
 export class MetaServiceTypeSelectorComponent implements OnInit {
 
-  @Output() selected = new EventEmitter<MetaCrawler>();
+  includeServices: MetaTargetType[];
 
-  metaTargetServiceTypes: MetaTargetServiceType[];
+  @Output() change = new EventEmitter<MetaCrawler[]>();
+  @Input() disabled: boolean;
+
+  metaTargetTypes: MetaTargetType[];
   pending$: Observable<boolean>;
   error$: Observable<any>;
 
@@ -26,25 +28,47 @@ export class MetaServiceTypeSelectorComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    this.metaTargetTypeService.readAllByMetaInfraType
-      (toMetaInfraType(MetaInfraTypeEnum.SERVICE))
+    this.metaTargetTypeService.readAllByMetaInfraTypeKey("SERVICE")
       .pipe(
         tap(() => {
           this.pending$ = of(true);
         }),
         map((metaTargetTypes: MetaTargetType[]) => {
-          this.metaTargetServiceTypes = metaTargetTypes;
-          console.log(this.metaTargetServiceTypes);
+          console.log(metaTargetTypes);
+          this.metaTargetTypes = metaTargetTypes;
         }),
         catchError(error => {
           this.error$ = of(error);
-          return of();
+          return of(null);
         }),
         tap(() => {
           this.pending$ = of(false);
+          this.includeServices = this.metaTargetTypes.slice();
+          this.change.emit(this.includeServices);
         }),
         take(1),
     ).subscribe();
   }
 
+
+  onSelectAll() {
+    this.includeServices = [];
+    this.metaTargetTypes.forEach((value) => {
+      this.includeServices.push(value);
+    });
+    this.change.emit(this.includeServices);
+  }
+
+  onUnselectAll() {
+    this.includeServices = [];
+    this.change.emit(this.includeServices);
+  }
+
+  onSelect(service: MetaTargetType) {
+    this.change.emit(this.includeServices);
+  }
+  onUnselect(service: MetaTargetType) {
+    this.change.emit(this.includeServices);
+  }
+
 }
diff --git a/@overflow/meta/service/meta-target-type.service.ts b/@overflow/meta/service/meta-target-type.service.ts
index ad7babc..c71e454 100644
--- a/@overflow/meta/service/meta-target-type.service.ts
+++ b/@overflow/meta/service/meta-target-type.service.ts
@@ -20,7 +20,7 @@ export class MetaTargetTypeService {
     return this.rpcService.call<MetaTargetType[]>('MetaTargetTypeService.readAll');
   }
 
-  public readAllByMetaInfraType(metaInfraType: MetaInfraType): Observable<MetaTargetType[]> {
-    return this.rpcService.call<MetaTargetType[]>('MetaTargetTypeService.readAllByMetaInfraType', metaInfraType);
+  public readAllByMetaInfraTypeKey(key: string): Observable<MetaTargetType[]> {
+    return this.rpcService.call<MetaTargetType[]>('MetaTargetTypeService.readAllByMetaInfraTypeKey', key);
   }
 }
diff --git a/@overflow/probe/component/probe-general.component.html b/@overflow/probe/component/probe-general.component.html
index ec448ea..1a5d626 100644
--- a/@overflow/probe/component/probe-general.component.html
+++ b/@overflow/probe/component/probe-general.component.html
@@ -10,7 +10,7 @@
 
     <div class="ui-g-6 nopad" dir="rtl" style="padding-top: 15px">
       <button class="ui-button-width-fit" *ngIf="!editMode" pButton type="button" label="Edit" (click)="editMode = true"></button>
-      <button class="ui-button-width-fit" *ngIf="editMode" pButton type="button" label="Save" (click)="onEditSave()" [disabled]="displayNamedisplayNameErrMsg || descriptionErrMsg"></button>
+      <button class="ui-button-width-fit" *ngIf="editMode" pButton type="button" label="Save" (click)="onEditSave()" [disabled]="namenameErrMsg || descriptionErrMsg"></button>
       <button class="ui-button-width-fit" *ngIf="editMode" pButton type="button" label="Cancel" (click)="editMode = false"></button>
     </div>
   </div>
@@ -25,9 +25,8 @@
               <div *ngIf="editMode" class="of-key-value-div">
                 <span>Name</span>
                 <span class="ng-star-inserted">
-                  <input #displayName type="text" pInputText value="{{probe.displayName}}" (keyup)="onDisplayNameEditing(displayName.value)"
-                  />
-                  <div *ngIf="displayNameErrMsg" class="ui-message ui-messages-error ui-corner-all">{{displayNameErrMsg}}</div>
+                  <input #name type="text" pInputText value="{{probe.name}}" (keyup)="onNameEditing(name.value)" />
+                  <div *ngIf="nameErrMsg" class="ui-message ui-messages-error ui-corner-all">{{nameErrMsg}}</div>
                 </span>
               </div>
               <of-key-value *ngIf="!editMode" [key]="'Name'" [value]="probe.name"></of-key-value>
diff --git a/@overflow/probe/component/probe-general.component.ts b/@overflow/probe/component/probe-general.component.ts
index 1b1f166..65781e5 100644
--- a/@overflow/probe/component/probe-general.component.ts
+++ b/@overflow/probe/component/probe-general.component.ts
@@ -22,9 +22,9 @@ export class ProbeGeneralComponent implements OnInit {
   pending$: Observable<boolean>;
 
   editMode = false;
-  displayNameErrMsg: string;
+  nameErrMsg: string;
   descriptionErrMsg: string;
-  displayName: string;
+  name: string;
   description: string;
 
   constructor(
@@ -61,13 +61,13 @@ export class ProbeGeneralComponent implements OnInit {
     }
   }
 
-  onDisplayNameEditing(value: string) {
-    const msg: string = this.checkValidDisplayName(value);
+  onNameEditing(value: string) {
+    const msg: string = this.checkValidName(value);
     if (msg !== null) {
-      this.displayNameErrMsg = msg;
+      this.nameErrMsg = msg;
     } else {
-      this.displayNameErrMsg = null;
-      this.displayName = value.trim();
+      this.nameErrMsg = null;
+      this.name = value.trim();
     }
   }
 
@@ -82,7 +82,7 @@ export class ProbeGeneralComponent implements OnInit {
   }
 
   onEditSave() {
-    this.probe.name = this.displayName ? this.displayName : this.probe.name;
+    this.probe.name = this.name ? this.name : this.probe.name;
     this.probe.description = this.description ? this.description : this.probe.description;
 
     this.probeService.modify(this.probe)
@@ -106,7 +106,7 @@ export class ProbeGeneralComponent implements OnInit {
     ).subscribe();
   }
 
-  checkValidDisplayName(value: string): string | null {
+  checkValidName(value: string): string | null {
     if (value.length <= 2 || value.length > 20) {
       return 'displayname length : 3 ~ 20';
     }
@@ -128,4 +128,3 @@ export class ProbeGeneralComponent implements OnInit {
     return null;
   }
 }
-
diff --git a/@overflow/probe/component/probe-host.component.html b/@overflow/probe/component/probe-host.component.html
index 05dd1e5..0184bce 100644
--- a/@overflow/probe/component/probe-host.component.html
+++ b/@overflow/probe/component/probe-host.component.html
@@ -19,7 +19,7 @@
         <div *ngIf="infraHost">
           <div class="ui-g">
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'IP ver'" [value]="infraHost.infraZone.metaIPType.value"></of-key-value>
+              <of-key-value [key]="'IP ver'" [value]="infraHost.infraZone.metaIPType.name"></of-key-value>
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">
@@ -31,7 +31,7 @@
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">
-              <of-key-value [key]="'Host Type'" [value]="infraHost.metaTargetHostType.value"></of-key-value>
+              <of-key-value [key]="'Host Type'" [value]="infraHost.metaTargetHostType.name"></of-key-value>
             </div>
 
             <div class="ui-g-12 ui-md-6 ui-key-value">