diff --git a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
index c1bd5bec..ba8e38fa 100644
--- a/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/NodeInfoEntityExtension.swift
@@ -22,6 +22,10 @@ extension NodeInfoEntity {
 		return self.telemetries?.filtered(using: NSPredicate(format: "metricsType == 1")).lastObject as? TelemetryEntity
 	}
 
+	var latestLocalStats: TelemetryEntity? {
+		return self.telemetries?.filtered(using: NSPredicate(format: "metricsType == 6")).lastObject as? TelemetryEntity
+	}
+
 	var hasPositions: Bool {
 		return positions?.count ?? 0 > 0
 	}
diff --git a/Meshtastic/Views/Messages/UserList.swift b/Meshtastic/Views/Messages/UserList.swift
index 3a2c4a47..7ba2205c 100644
--- a/Meshtastic/Views/Messages/UserList.swift
+++ b/Meshtastic/Views/Messages/UserList.swift
@@ -227,6 +227,9 @@ struct UserList: View {
 			.onChange(of: maxDistance) { _ in
 				searchUserList()
 			}
+			.onReceive(users.publisher) { _ in
+				searchUserList()
+			}
 			.onAppear {
 				searchUserList()
 			}
diff --git a/Meshtastic/Views/Nodes/MeshMap.swift b/Meshtastic/Views/Nodes/MeshMap.swift
index 9e09a0c0..f471caaf 100644
--- a/Meshtastic/Views/Nodes/MeshMap.swift
+++ b/Meshtastic/Views/Nodes/MeshMap.swift
@@ -126,7 +126,7 @@ struct MeshMap: View {
 				guard case .map(let selectedNodeNum) = router.navigationState else { return }
 				// TODO: handle deep link for waypoints
 			}
-			.onChange(of: (selectedMapLayer)) { newMapLayer in
+			.onChange(of: selectedMapLayer) { newMapLayer in
 				switch selectedMapLayer {
 				case .standard:
 					UserDefaults.mapLayer = newMapLayer
diff --git a/Meshtastic/Views/Nodes/NodeList.swift b/Meshtastic/Views/Nodes/NodeList.swift
index c5c92418..c0f16dd8 100644
--- a/Meshtastic/Views/Nodes/NodeList.swift
+++ b/Meshtastic/Views/Nodes/NodeList.swift
@@ -344,6 +344,11 @@ struct NodeList: View {
 				self.selectedNode = nil
 			}
 		}
+		.onReceive(nodes.publisher) { _ in
+			Task {
+				await searchNodeList()
+			}
+		}
 		.onAppear {
 			Task {
 				await searchNodeList()