From 22527bf5d44eac1a34c0fec9b5d17fff8f990c9d Mon Sep 17 00:00:00 2001
From: Andriy Tretyak <atretyak1985@gmail.com>
Date: Fri, 29 Mar 2019 17:55:57 +0100
Subject: [PATCH 1/2] fix routeReused subscription

---
 src/organization/device/device_list.component.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/organization/device/device_list.component.ts b/src/organization/device/device_list.component.ts
index 0cba900710e..5e45a05f7da 100755
--- a/src/organization/device/device_list.component.ts
+++ b/src/organization/device/device_list.component.ts
@@ -194,7 +194,7 @@ export class DeviceListComponent implements OnInit {
 
         this.ptable.first = 0;
 
-        this.customReuseStrategyService.routeReused$.subscribe((d: any) => {
+        const routeReusedHandler = (d: any) => {
             if (this.route.snapshot.url == d.url) {
                 this.selectedId = this.route.snapshot.queryParams['id'];
                 if (this.selectedId) {
@@ -222,7 +222,10 @@ export class DeviceListComponent implements OnInit {
                     this.savedScrollPos = scrollPos;
                 }
             }
-        });
+        };
+
+        routeReusedHandler({url: this.route.snapshot.url});
+        this.customReuseStrategyService.routeReused$.subscribe(routeReusedHandler);
 
         this.badgeContainers.changes.subscribe(() => {
             this.determineBadges();

From 7182f57fa333efb4ea22b2ea0493313ab41fbebc Mon Sep 17 00:00:00 2001
From: Andriy Tretyak <atretyak1985@gmail.com>
Date: Fri, 29 Mar 2019 17:57:14 +0100
Subject: [PATCH 2/2] remove device labels filter from device detail component

---
 src/organization/device/device_detail.component.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/organization/device/device_detail.component.html b/src/organization/device/device_detail.component.html
index cdd98d397a6..5fbda0d444e 100644
--- a/src/organization/device/device_detail.component.html
+++ b/src/organization/device/device_detail.component.html
@@ -44,7 +44,6 @@
                     for="staleaccounts" class="label-filter-pane">Stale Accounts (&gt;90 days)</label>
             </div>
         </context-filter-section>
-        <label-filter-section #section></label-filter-section>
     </side-filter>
 
     <side-filter #filterPanel *ngIf="isTabSelected(GROUP_POLICY_TAB_INDEX)" (onFilterChange)="updateProfileFilters($event)">
@@ -89,7 +88,6 @@
                 <input  type="checkbox" class="checkbox" id="resolved" (click)="filterChanged($event)" [(ngModel)]="serviceDeviceIncident.userFiltersState['resolved']"/><label for="resolved" class="label-filter-pane">Resolved Incidents</label>
             </div>
         </context-filter-section>
-        <label-filter-section #section></label-filter-section>
     </side-filter>
 
     <side-filter #filterPanel *ngIf="isTabSelected(PATCH_TAB_INDEX)" (onFilterChange)="updateProfileFilters($event)">