 			ActivityID.accountName.rawValue: feed.account?.name ?? "",
 			ActivityID.feedID.rawValue: feed.feedID
 		]
-
-		let attributeSet = CSSearchableItemAttributeSet(itemContentType: kUTTypeItem as String)
-		attributeSet.title = feed.nameForDisplay
-		attributeSet.keywords = makeKeywords(feed.nameForDisplay)
-		if let image = appDelegate.feedIconDownloader.icon(for: feed) {
-			attributeSet.thumbnailData = image.pngData()
-		} else if let image = appDelegate.faviconDownloader.faviconAsAvatar(for: feed) {
-			attributeSet.thumbnailData = image.pngData()
-		}
-		selectingActivity!.contentAttributeSet = attributeSet
+		selectingActivity!.requiredUserInfoKeys = [ActivityID.accountID.rawValue, ActivityID.accountName.rawValue, ActivityID.feedID.rawValue]
+		updateSelectingActivityFeedSearchAttributes(with: feed)
 		
 		selectingActivity!.becomeCurrent()
 	}

		NSUserActivity.deleteSavedUserActivities(withPersistentIdentifiers: identifers(for: feed)) {}
	}
	
}

// MARK: Private

	private var selectingActivity: NSUserActivity? = nil
	private var readingActivity: NSUserActivity? = nil

	init() {
		NotificationCenter.default.addObserver(self, selector: #selector(feedIconDidBecomeAvailable(_:)), name: .FeedIconDidBecomeAvailable, object: nil)
	}
	
	func selectingToday() {
		let title = NSLocalizedString("See articles for Today", comment: "Today")
		selectingActivity = makeSelectingActivity(type: ActivityType.selectToday, title: title, identifier: "smartfeed.today")
