diff --git a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
index 79d4f581..9e9a6c49 100644
--- a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
@@ -14,13 +14,33 @@ extension PositionEntity {
 	
 	static func allPositionsFetchRequest() -> NSFetchRequest<PositionEntity> {
 		let request: NSFetchRequest<PositionEntity> = PositionEntity.fetchRequest()
-		request.fetchLimit = 50
+		request.fetchLimit = 200
 		//request.fetchBatchSize = 1
-		//request.returnsObjectsAsFaults = true
+		request.returnsObjectsAsFaults = false
 		//request.includesSubentities = false
 		request.returnsDistinctResults = true
 		request.sortDescriptors = [NSSortDescriptor(key: "time", ascending: false)]
-		request.predicate = NSPredicate(format: "nodePosition != nil && latest == true && time >= %@", Calendar.current.date(byAdding: .day, value: -2, to: Date())! as NSDate)
+		
+		let positionPredicate = NSPredicate(format: "nodePosition != nil && latest == true && time >= %@", Calendar.current.date(byAdding: .day, value: -2, to: Date())! as NSDate)
+		
+		let pointOfInterest = LocationHelper.currentLocation
+		
+		if pointOfInterest.latitude != LocationHelper.DefaultLocation.latitude && pointOfInterest.longitude != LocationHelper.DefaultLocation.longitude {
+			/// Lets just get nodes within about 500 miles
+			let D: Double = 800000 * 1.1
+			let R: Double = 6371009
+			let meanLatitidue = pointOfInterest.latitude * .pi / 180
+			let deltaLatitude = D / R * 180 / .pi
+			let deltaLongitude = D / (R * cos(meanLatitidue)) * 180 / .pi
+			let minLatitude: Double = pointOfInterest.latitude - deltaLatitude
+			let maxLatitude: Double = pointOfInterest.latitude + deltaLatitude
+			let minLongitude: Double = pointOfInterest.longitude - deltaLongitude
+			let maxLongitude: Double = pointOfInterest.longitude + deltaLongitude
+			let distancePredicate = NSPredicate(format: "(%lf <= (longitudeI / 1e7)) AND ((longitudeI / 1e7) <= %lf) AND (%lf <= (latitudeI / 1e7)) AND ((latitudeI / 1e7) <= %lf)", minLongitude, maxLongitude,minLatitude, maxLatitude)
+			request.predicate = NSCompoundPredicate(type: .and, subpredicates: [distancePredicate, positionPredicate])
+		} else {
+			request.predicate = positionPredicate
+		}
 		return request
 	}