 		let chunkProgress = Double(self.progressProcessImportChunk) * chunkPercentage
 
         for map in DataMap.getAll(with: manager, alterFetchRequest: { fetchRequest in
-            fetchRequest.predicate = NSPredicate(format: "(inMapId = nil)")
+//            fetchRequest.predicate = NSPredicate(format: "(inMapId == nil)")
+            fetchRequest.predicate = NSPredicate(format: "(relatedEvents.@count > 0)")
         }) {
             self.applyInheritedEvents(
                 map: map,

	// Must group these by type
	public typealias CoreDataFileImport = (type: BaseDataFileImportType, filename: String, progress: Double)

	public let progressFiles: [CoreDataFileImport] = [
		(type: .event, filename: "DataEvents_1", progress: 1),
		(type: .event, filename: "DataEvents_2", progress: 1),
		(type: .event, filename: "DataEvents_3", progress: 1),
		(type: .decision, filename: "DataDecisions_1", progress: 1),
		(type: .decision, filename: "DataDecisions_2", progress: 1),
		(type: .decision, filename: "DataDecisions_3", progress: 1),

	}

	func addData() {
		let progressTotal = (progressFilesEvents + progressFilesOther).map { $0.progress }.reduce(0.0, +)
			+ (progressProcessImportChunk * 2.0) + progressFinalPadding
		importDataFiles(progress: 0.0, progressTotal: progressTotal)
		processImportedData(
