diff --git a/Server/wwwroot/scripts/Main/DataGrid.js b/Server/wwwroot/scripts/Main/DataGrid.js
index 2b840fad..f0e4f3aa 100644
--- a/Server/wwwroot/scripts/Main/DataGrid.js
+++ b/Server/wwwroot/scripts/Main/DataGrid.js
@@ -8,26 +8,30 @@ import { ShowModal } from "../Shared/UI.js";
 export const DataSource = new Array();
 export const FilterOptions = new class {
     constructor() {
+        this.GroupFilter = "";
+        this.OnlineOnly = false;
+        this.SearchFilter = "";
         this.ShowAllGroups = true;
     }
 };
 export function AddOrUpdateDevices(devices) {
+    DataSource.splice(0);
     devices.sort((a, b) => {
-        if (a.IsOnline && !b.IsOnline) {
-            return -1;
-        }
-        else if (b.IsOnline && !a.IsOnline) {
-            return 1;
-        }
+        //if (a.IsOnline && !b.IsOnline) {
+        //    return -1;
+        //}
+        //else if (b.IsOnline && !a.IsOnline) {
+        //    return 1;
+        //}
         return a.DeviceName.localeCompare(b.DeviceName, [], { sensitivity: "base" });
     });
     devices.forEach(x => {
-        AddOrUpdateDevice(x, false);
+        AddOrUpdateDevice(x);
     });
     ApplyFilter();
     UpdateDeviceCounts();
 }
-export function AddOrUpdateDevice(device, sortDevices) {
+export function AddOrUpdateDevice(device) {
     var existingIndex = DataSource.findIndex(x => x.ID == device.ID);
     if (existingIndex > -1) {
         DataSource[existingIndex] = device;
@@ -35,17 +39,6 @@ export function AddOrUpdateDevice(device, sortDevices) {
     else {
         DataSource.push(device);
     }
-    if (sortDevices) {
-        var selectedDevices = GetSelectedDevices();
-        UI.DeviceGrid.querySelectorAll(".record-row").forEach(row => {
-            row.remove();
-        });
-        AddOrUpdateDevices(DataSource);
-        selectedDevices.forEach(x => {
-            document.getElementById(x.ID).classList.add("row-selected");
-        });
-        return;
-    }
     var tableBody = document.querySelector("#" + Main.UI.DeviceGrid.id + " tbody");
     var recordRow = document.getElementById(device.ID);
     if (recordRow == null) {
@@ -106,12 +99,18 @@ export function AddOrUpdateDevice(device, sortDevices) {
 export function ApplyFilter() {
     for (var i = 0; i < DataSource.length; i++) {
         var row = document.getElementById(DataSource[i].ID);
-        if (FilterOptions.ShowAllGroups ||
-            (DataSource[i].DeviceGroupID || "") == (FilterOptions.GroupFilter || "")) {
-            if (!FilterOptions.SearchFilter || deviceMatchesFilter(DataSource[i])) {
-                row.classList.remove("hidden");
-                continue;
-            }
+        if (FilterOptions.OnlineOnly && !DataSource[i].IsOnline) {
+            row.classList.add("hidden");
+            continue;
+        }
+        if (!FilterOptions.ShowAllGroups &&
+            (DataSource[i].DeviceGroupID || "") != (FilterOptions.GroupFilter || "")) {
+            row.classList.add("hidden");
+            continue;
+        }
+        if (deviceMatchesSearchFilter(DataSource[i])) {
+            row.classList.remove("hidden");
+            continue;
         }
         row.classList.add("hidden");
     }
@@ -182,7 +181,10 @@ export function UpdateDeviceCounts() {
         AddConsoleOutput(`Your selection contains offline computers.  Your commands will only be sent to those that are online.`);
     }
 }
-function deviceMatchesFilter(device) {
+function deviceMatchesSearchFilter(device) {
+    if (!FilterOptions.SearchFilter) {
+        return true;
+    }
     for (var key in device) {
         var value = device[key];
         if (!value) {
diff --git a/Server/wwwroot/scripts/Main/DataGrid.ts b/Server/wwwroot/scripts/Main/DataGrid.ts
index 25a35d26..4ef01f39 100644
--- a/Server/wwwroot/scripts/Main/DataGrid.ts
+++ b/Server/wwwroot/scripts/Main/DataGrid.ts
@@ -9,32 +9,37 @@ import { ShowModal } from "../Shared/UI.js";
 
 
 export const DataSource: Array<Device> = new Array<Device>();
+
 export const FilterOptions = new class {
-    GroupFilter: string;
-    SearchFilter: string;
+    GroupFilter: string = "";
+    OnlineOnly: boolean = false;
+    SearchFilter: string = "";
     ShowAllGroups: boolean = true;
 };
 
 
 export function AddOrUpdateDevices(devices: Array<Device>) {
+    DataSource.splice(0);
+
     devices.sort((a, b) => {
-        if (a.IsOnline && !b.IsOnline) {
-            return -1;
-        }
-        else if (b.IsOnline && !a.IsOnline) {
-            return 1;
-        }
+        //if (a.IsOnline && !b.IsOnline) {
+        //    return -1;
+        //}
+        //else if (b.IsOnline && !a.IsOnline) {
+        //    return 1;
+        //}
         return a.DeviceName.localeCompare(b.DeviceName, [], { sensitivity: "base" });
     });
 
     devices.forEach(x => {
-        AddOrUpdateDevice(x, false);
+        AddOrUpdateDevice(x);
     });
+
     ApplyFilter();
     UpdateDeviceCounts();
 }
 
-export function AddOrUpdateDevice(device: Device, sortDevices: boolean) {
+export function AddOrUpdateDevice(device: Device) {
     var existingIndex = DataSource.findIndex(x => x.ID == device.ID);
     if (existingIndex > -1) {
         DataSource[existingIndex] = device;
@@ -43,21 +48,6 @@ export function AddOrUpdateDevice(device: Device, sortDevices: boolean) {
         DataSource.push(device);
     }
 
-    if (sortDevices) {
-        var selectedDevices = GetSelectedDevices();
-
-        UI.DeviceGrid.querySelectorAll(".record-row").forEach(row => {
-            row.remove();
-        });
-        AddOrUpdateDevices(DataSource);
-
-        selectedDevices.forEach(x => {
-            document.getElementById(x.ID).classList.add("row-selected");
-        });
-
-        return;
-    }
-
     var tableBody = document.querySelector("#" + Main.UI.DeviceGrid.id + " tbody");
     var recordRow = document.getElementById(device.ID);
     if (recordRow == null) {
@@ -116,18 +106,29 @@ export function AddOrUpdateDevice(device: Device, sortDevices: boolean) {
         AddConsoleOutput("Launching remote control on client device...");
         HubConnection.Connection.invoke("RemoteControl", device.ID);
     };
+
     UpdateDeviceCounts();
 }
 export function ApplyFilter() {
     for (var i = 0; i < DataSource.length; i++) {
         var row = document.getElementById(DataSource[i].ID);
-        if (FilterOptions.ShowAllGroups ||
-            (DataSource[i].DeviceGroupID || "") == (FilterOptions.GroupFilter || "")) {
-            if (!FilterOptions.SearchFilter || deviceMatchesFilter(DataSource[i])) {
-                row.classList.remove("hidden");
-                continue;
-            }
+
+        if (FilterOptions.OnlineOnly && !DataSource[i].IsOnline) {
+            row.classList.add("hidden");
+            continue;
         }
+
+        if (!FilterOptions.ShowAllGroups &&
+            (DataSource[i].DeviceGroupID || "") != (FilterOptions.GroupFilter || "")) {
+            row.classList.add("hidden");
+            continue;
+        }
+
+        if (deviceMatchesSearchFilter(DataSource[i])) {
+            row.classList.remove("hidden");
+            continue;
+        }
+
         row.classList.add("hidden");
     }
 }
@@ -202,7 +203,11 @@ export function UpdateDeviceCounts() {
     }
 }
 
-function deviceMatchesFilter(device: Device) {
+function deviceMatchesSearchFilter(device: Device) {
+    if (!FilterOptions.SearchFilter) {
+        return true;
+    }
+
     for (var key in device) {
         var value = device[key];
         if (!value) {