         NotificationCenter.default.addObserver(self, selector: #selector(applyColorPalette), name: name, object: nil)
         
         // Prepare data source
-        self.selectedTags = self.dataProvider.fetchedResultsController.fetchedObjects?
-                                .filter({self.selectedTagIds.contains($0.tagId)}) ?? [Tag]()
-        self.nonSelectedTags = self.dataProvider.fetchedResultsController.fetchedObjects?
-                                .filter({!self.selectedTagIds.contains($0.tagId)}) ?? [Tag]()
+        self.selectedTags = dataProvider.fetchedResultsController.fetchedObjects?
+                                .filter({selectedTagIds.contains($0.tagId)}) ?? [Tag]()
+        self.nonSelectedTags = dataProvider.fetchedResultsController.fetchedObjects?
+                                .filter({!selectedTagIds.contains($0.tagId)}) ?? [Tag]()
         // Build ABC index
         self.updateSectionIndex()
         

            // List of selected tags
            if let index = selectedTags.firstIndex(where: {$0.tagId == tag.tagId}) {
                let updateAtIndexPath = IndexPath.init(row: index, section: 0)
                print(".update =>", updateAtIndexPath.debugDescription)
                if let cell = tableView.cellForRow(at: updateAtIndexPath) as? TagTableViewCell {
                    cell.configure(with: tag, andEditOption: .remove)
                }


        // Use the TagsProvider to fetch tag data. On completion,
        // handle general UI updates and error alerts on the main queue.
        DispatchQueue.global(qos: .userInteractive).async {
            self.dataProvider.fetchTags(asAdmin: self.hasTagCreationRights) { error in
                guard let error = error else { return }     // Done if no error

                // Show an alert if there was an error.
                DispatchQueue.main.async {
                    self.dismissPiwigoError(withTitle: "", message: NSLocalizedString("CoreDataFetch_TagError", comment: "Fetch tags error!"), errorMessage: error.localizedDescription) { }
                }
            }
        }
        
