 				self.refreshProgress.completeTask()
 				BatchUpdate.shared.perform {
 					self.syncFeeds(account, subscriptions)
-					self.syncTaggings(account, subscriptions)
+					self.syncFeedFolderRelationship(account, subscriptions)
 				}
 				completion(.success(()))
 			case .failure(let error):

						switch result {
						case .success:
							DispatchQueue.main.async {
								self.clearFolderRelationship(for: feed, withFolderName: folder.name ?? "")
							}
						case .failure(let error):
							os_log(.error, log: self.log, "Remove feed error: %@.", error.localizedDescription)

					guard let feed = account.existingWebFeed(withWebFeedID: taggingFeedID) else {
						continue
					}
					saveFolderRelationship(for: feed, folderExternalID: folderExternalID, feedExternalID: subscription.feedID)
					folder.addWebFeed(feed)
				}
			}
			
		}
	
		let taggedFeedIDs = Set(subscriptions.map { String($0.feedID) })
		
		// Remove all feeds from the account container that have a tag
		for feed in account.topLevelWebFeeds {
			if taggedFeedIDs.contains(feed.webFeedID) {
