3 files changed, 11 insertions, 7 deletions

diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index 3edbec7..26d4f82 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -53,7 +53,9 @@ ModelResult<T, Ptr>::ModelResult(const Sink::Query &query, const QList<QByteArra
     : QAbstractItemModel(), mLogCtx(ctx.subContext("modelresult")), mPropertyColumns(propertyColumns), mQuery(query)
 {
     if (query.flags().testFlag(Sink::Query::UpdateStatus)) {
-        mNotifier.reset(new Sink::Notifier{query});
+        Sink::Query resourceQuery;
+        resourceQuery.setFilter(query.getResourceFilter());
+        mNotifier.reset(new Sink::Notifier{resourceQuery});
         mNotifier->registerHandler([this](const Notification &notification) {
             switch (notification.type) {
                 case Notification::Status:
@@ -120,8 +122,10 @@ ModelResult<T, Ptr>::ModelResult(const Sink::Query &query, const QList<QByteArra
                     changedRoles << WarningRole;
                 }
 
-                const auto idx = createIndexFromId(id);
-                emit dataChanged(idx, idx, changedRoles);
+                if (!changedRoles.isEmpty()) {
+                    const auto idx = createIndexFromId(id);
+                    emit dataChanged(idx, idx, changedRoles);
+                }
             }
         });
     }
diff --git a/common/notifier.cpp b/common/notifier.cpp
index 7dbc85e..f52e28b 100644
--- a/common/notifier.cpp
+++ b/common/notifier.cpp
@@ -39,7 +39,7 @@ public:
 
     void listenForNotifications(const QSharedPointer<ResourceAccess> &access)
     {
-        QObject::connect(access.data(), &ResourceAccess::notification, context.data(), [this](const Notification &notification) {
+        QObject::connect(access.data(), &ResourceAccess::notification, &context, [this](const Notification &notification) {
             for (const auto &handler : handler) {
                 handler(notification);
             }
@@ -49,7 +49,7 @@ public:
 
     QList<QSharedPointer<ResourceAccess>> resourceAccess;
     QList<std::function<void(const Notification &)>> handler;
-    QSharedPointer<QObject> context;
+    QObject context;
 };
 
 Notifier::Notifier(const QSharedPointer<ResourceAccess> &resourceAccess) : d(new Sink::Notifier::Private)
@@ -77,7 +77,7 @@ Notifier::Notifier(const Sink::Query &resourceQuery) : d(new Sink::Notifier::Pri
     auto result = facade->load(resourceQuery, resourceCtx);
     auto emitter = result.second;
     emitter->onAdded([=](const ApplicationDomain::SinkResource::Ptr &resource) {
-        auto resourceAccess = Sink::ResourceAccess::Ptr::create(resource->identifier(), ResourceConfig::getResourceType(resource->identifier()));
+        auto resourceAccess = Sink::ResourceAccessFactory::instance().getAccess(resource->identifier(), ResourceConfig::getResourceType(resource->identifier()));
         resourceAccess->open();
         d->listenForNotifications(resourceAccess);
     });
diff --git a/common/store.cpp b/common/store.cpp
index 264f2e3..8c0a985 100644
--- a/common/store.cpp
+++ b/common/store.cpp
@@ -279,7 +279,7 @@ KAsync::Job<void> Store::removeDataFromDisk(const QByteArray &identifier)
 
 static KAsync::Job<void> synchronize(const QByteArray &resource, const Sink::SyncScope &scope)
 {
-    SinkLog() << "Synchronizing " << resource;
+    SinkLog() << "Synchronizing " << resource << scope;
     auto resourceAccess = ResourceAccessFactory::instance().getAccess(resource, ResourceConfig::getResourceType(resource));
     return resourceAccess->synchronizeResource(scope)
         .addToContext(resourceAccess)