diff --git a/src/packages/discovery/component/setting/setting.component.ts b/src/packages/discovery/component/setting/setting.component.ts
index 3c6a3aa..1b07e01 100644
--- a/src/packages/discovery/component/setting/setting.component.ts
+++ b/src/packages/discovery/component/setting/setting.component.ts
@@ -5,7 +5,9 @@ import { RPCClientError } from '@loafer/ng-rpc/protocol';
 import {
   DiscoveryStartInfo,
   DiscoveryZone,
-  Zone
+  Zone,
+  DiscoveryPort,
+  DiscoveryService
 } from '../../model';
 import * as CIDR from 'ip-cidr';
 import * as DiscoveredStore from '../../store/setting';
@@ -185,7 +187,9 @@ export class SettingComponent implements OnInit, AfterContentInit {
   }
 
   handleServiceCheckChange(e: MatCheckboxChange) {
-    this.includeServices = null;
+    if (e.checked) {
+      this.portChecked = true;
+    }
   }
 
   handleServiceChange(list: any) {
@@ -193,31 +197,38 @@ export class SettingComponent implements OnInit, AfterContentInit {
   }
 
   discovery() {
-    if (!this.portChecked) {
-      this.startPort = '0';
-      this.endPort = '0';
+    let discoveryPort: DiscoveryPort = null;
+    let discoveryService: DiscoveryService = null;
+
+    if (this.serviceChecked) {
+      const services = new Array();
+      for (const service of this.includeServices) {
+        services.push(service.name);
+      }
+      discoveryService = {
+        includeServices: services,
+      };
     }
-    const services = new Array();
-    for (const service of this.includeServices) {
-      services.push(service.name);
+    if (this.portChecked) {
+      discoveryPort = {
+        firstScanRange: this.startPort,
+        lastScanRange: this.endPort,
+        includeTCP: this.tcpChecked,
+        includeUDP: this.udpChecked,
+        excludePorts: null,
+        discoveryService: discoveryService
+      };
     }
     const discoveryZone: DiscoveryZone = {
       discoveryHost: {
         firstScanRange: this.startIP,
         lastScanRange: this.endIP,
-        discoveryPort: {
-          firstScanRange: this.startPort,
-          lastScanRange: this.endPort,
-          includeTCP: this.tcpChecked,
-          includeUDP: this.udpChecked,
-          excludePorts: null,
-          discoveryService: {
-            includeServices: services
-          }
-        },
+        discoveryPort: discoveryPort,
       },
     };
 
+    console.log(discoveryZone);
+
     console.log('start discovery - ' + this.probe.probeKey);
     this.discoverstore.dispatch(new DiscoverStore.DiscoverZone(
       { probeID: this.probe.probeKey, discoveryZone: discoveryZone }));
diff --git a/src/packages/sensor/component/list/filter/filter.component.html b/src/packages/sensor/component/list/filter/filter.component.html
index b71faba..d0fbdc8 100644
--- a/src/packages/sensor/component/list/filter/filter.component.html
+++ b/src/packages/sensor/component/list/filter/filter.component.html
@@ -15,7 +15,7 @@
 <div [style.margin]="'30px 0px'">
   <div>Status</div>
   <mat-radio-group class="radio-group">
-    <mat-radio-button class="radio-button" value="0">All</mat-radio-button>
+    <mat-radio-button class="radio-button" value="0" [checked]="true">All</mat-radio-button>
     <mat-radio-button class="radio-button" value="1">Active</mat-radio-button>
     <mat-radio-button class="radio-button" value="2">Inactive</mat-radio-button>
   </mat-radio-group>
@@ -23,7 +23,7 @@
 <div [style.margin]="'30px 0px'">
   <div>Type</div>
   <mat-radio-group class="radio-group">
-    <mat-radio-button class="radio-button" value="0">All</mat-radio-button>
+    <mat-radio-button class="radio-button" value="0" [checked]="true">All</mat-radio-button>
     <mat-radio-button class="radio-button" value="1">Host</mat-radio-button>
     <mat-radio-button class="radio-button" value="2">Application</mat-radio-button>
   </mat-radio-group>
diff --git a/src/packages/sensor/component/setting/target-selector/target-selector.component.html b/src/packages/sensor/component/setting/target-selector/target-selector.component.html
index 2905d56..21e11ad 100644
--- a/src/packages/sensor/component/setting/target-selector/target-selector.component.html
+++ b/src/packages/sensor/component/setting/target-selector/target-selector.component.html
@@ -9,7 +9,7 @@
       <perfect-scrollbar style="height: 150px">
 
         <mat-radio-group class="radio-group" >
-          <mat-radio-button class="radio-button" *ngFor="let t of targets" value={{t.id}} (change)="targetSelected(t)" [checked]="targets.length === 0 && t.id === target.id">
+          <mat-radio-button class="radio-button" *ngFor="let t of targets" value={{t.id}} (change)="targetSelected(t)" [checked]="targets.length === 1 && t.id === target.id">
             {{t.displayName}}
           </mat-radio-button>
         </mat-radio-group>