diff --git a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
index 9e9a6c49..5d5e2fa5 100644
--- a/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
+++ b/Meshtastic/Extensions/CoreData/PositionEntityExtension.swift
@@ -14,14 +14,14 @@ extension PositionEntity {
 	
 	static func allPositionsFetchRequest() -> NSFetchRequest<PositionEntity> {
 		let request: NSFetchRequest<PositionEntity> = PositionEntity.fetchRequest()
-		request.fetchLimit = 200
+		//request.fetchLimit = 200
 		//request.fetchBatchSize = 1
 		request.returnsObjectsAsFaults = false
-		//request.includesSubentities = false
+		request.includesSubentities = true
 		request.returnsDistinctResults = true
 		request.sortDescriptors = [NSSortDescriptor(key: "time", ascending: false)]
 		
-		let positionPredicate = NSPredicate(format: "nodePosition != nil && latest == true && time >= %@", Calendar.current.date(byAdding: .day, value: -2, to: Date())! as NSDate)
+		let positionPredicate = NSPredicate(format: "nodePosition != nil && nodePosition.user.shortName != nil && latest == true && time >= %@", Calendar.current.date(byAdding: .day, value: -2, to: Date())! as NSDate)
 		
 		let pointOfInterest = LocationHelper.currentLocation
 		
@@ -37,7 +37,7 @@ extension PositionEntity {
 			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])
+			request.predicate = NSCompoundPredicate(type: .and, subpredicates: [positionPredicate, distancePredicate])
 		} else {
 			request.predicate = positionPredicate
 		}