diff --git a/src/models/links/links.cpp b/src/models/links/links.cpp
index ca9df59ca81cc240600ecf5599620cc42288b68d..84d1af8cc40b3c4f5e187170bb96f12b0dd5f6a6 100644
--- a/src/models/links/links.cpp
+++ b/src/models/links/links.cpp
@@ -13,7 +13,7 @@
 Links::Links(QObject *parent) : BaseList(parent)
 {
     this->db = DB::getInstance();
-    this->tag =  Tagging::getInstance(OWL::App, OWL::version, "org.kde.buho", OWL::comment);
+    this->tag =  Tagging::getInstance();
     this->sortList();
 
     connect(this, &Links::sortByChanged, this, &Links::sortList);
diff --git a/src/models/notes/notes.cpp b/src/models/notes/notes.cpp
index 6773a99b7181458e564e500b1d9dd61f5382bedf..670a117a53429682307feb7f1318529827fcf1ae 100644
--- a/src/models/notes/notes.cpp
+++ b/src/models/notes/notes.cpp
@@ -12,7 +12,7 @@ Notes::Notes(QObject *parent) : BaseList(parent)
 {
     qDebug()<< "CREATING NOTES LIST";
     this->db = DB::getInstance();
-    this->tag =  Tagging::getInstance(OWL::App, OWL::version, "org.kde.buho", OWL::comment);
+    this->tag =  Tagging::getInstance();
     this->sortList();
 
     connect(this, &Notes::sortByChanged, this, &Notes::sortList);
diff --git a/src/views/links/Previewer.qml b/src/views/links/Previewer.qml
index 77d85e788419fddd29de8bcfe03256f0bacefe12..9c820528fef3c753f7efe5a6b432e59283e2b354 100644
--- a/src/views/links/Previewer.qml
+++ b/src/views/links/Previewer.qml
@@ -129,12 +129,9 @@ Maui.Dialog
             id: tagBar
             Layout.fillWidth: true
             allowEditMode: true
-
-            onTagsEdited:
-            {
-                for(var i in tags)
-                    append({tag : tags[i]})
-            }
+            list.abstract: true
+            list.key: "links"
+            onTagsEdited: list.updateToAbstract(tags)
         }
     }
 
@@ -143,7 +140,7 @@ Maui.Dialog
     {
         console.log("STATE:" , link.fav)
         webView.url = link.link
-        tagBar.populate(link.tags)
+        tagBar.list.lot = link.link
         pinButton.checked = link.pin == 1
         favButton.checked = link.fav == 1
         selectedColor = link.color
diff --git a/src/widgets/NewLinkDialog.qml b/src/widgets/NewLinkDialog.qml
index aedf296ed85b14950930a742e6db160a17c223c7..230d35a18294eeaf4294ae02d744c4a1b55eec5d 100644
--- a/src/widgets/NewLinkDialog.qml
+++ b/src/widgets/NewLinkDialog.qml
@@ -182,12 +182,9 @@ Maui.Dialog
             visible: previewReady
             Layout.fillWidth: true
             allowEditMode: true
-
-            onTagsEdited:
-            {
-                for(var i in tags)
-                    append({tag : tags[i]})
-            }
+            list.abstract: true
+            list.key: "links"
+            onTagsEdited: list.updateToAbstract(tags)
         }
     }
 
@@ -206,6 +203,7 @@ Maui.Dialog
     {
         title.text = link.title
         populatePreviews(link.image)
+        tagBar.list.lot= link.url
 
         open()
     }
diff --git a/src/widgets/NewNoteDialog.qml b/src/widgets/NewNoteDialog.qml
index 25058419e0715521d7c8f9b165905d774a259333..22a6268ec6458058747dc31fe77825f414aaf578 100644
--- a/src/widgets/NewNoteDialog.qml
+++ b/src/widgets/NewNoteDialog.qml
@@ -172,12 +172,9 @@ Maui.Dialog
             id: tagBar
             Layout.fillWidth: true
             allowEditMode: true
-
-            onTagsEdited:
-            {
-                for(var i in tags)
-                    append({tag : tags[i]})
-            }
+            list.abstract: true
+            list.key: "notes"
+            onTagsEdited: list.updateToAbstract(tags)
         }
     }
 
@@ -198,7 +195,8 @@ Maui.Dialog
         selectedColor =  note.color
         pinButton.checked = note.pin == 1
         favButton.checked = note.fav == 1
-        tagBar.populate(note.tags)
+
+        tagBar.list.lot= note.id
 
         open()
     }