3 files changed, 15 insertions, 9 deletions

diff --git a/common/facade.cpp b/common/facade.cpp
index 850d28b..68770b5 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -350,12 +350,14 @@ template<class DomainType>
 qint64 GenericFacade<DomainType>::executeInitialQuery(const Akonadi2::Query &query, const typename DomainType::Ptr &parent, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
 {
     auto modifiedQuery = query;
-    if (parent && !query.parentProperty.isEmpty()) {
-        Trace() << "Running initial query for parent:" << parent->identifier();
-        modifiedQuery.propertyFilter.insert(query.parentProperty, parent->identifier());
-    } else {
-        Trace() << "Running initial query for toplevel";
-        modifiedQuery.propertyFilter.insert(query.parentProperty, QVariant());
+    if (!query.parentProperty.isEmpty()) {
+        if (parent) {
+            Trace() << "Running initial query for parent:" << parent->identifier();
+            modifiedQuery.propertyFilter.insert(query.parentProperty, parent->identifier());
+        } else {
+            Trace() << "Running initial query for toplevel";
+            modifiedQuery.propertyFilter.insert(query.parentProperty, QVariant());
+        }
     }
     return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
         return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);
diff --git a/common/modelresult.cpp b/common/modelresult.cpp
index 4102cda..935e2e8 100644
--- a/common/modelresult.cpp
+++ b/common/modelresult.cpp
@@ -27,7 +27,8 @@
 template<class T, class Ptr>
 ModelResult<T, Ptr>::ModelResult(const Akonadi2::Query &query, const QList<QByteArray> &propertyColumns)
     :QAbstractItemModel(),
-    mPropertyColumns(propertyColumns)
+    mPropertyColumns(propertyColumns),
+    mQuery(query)
 {
 }
 
@@ -42,7 +43,10 @@ static qint64 getIdentifier(const QModelIndex &idx)
 template<class T, class Ptr>
 qint64 ModelResult<T, Ptr>::parentId(const Ptr &value)
 {
-    return qHash(value->getProperty("parent").toByteArray());
+    if (!mQuery.parentProperty.isEmpty()) {
+        return qHash(value->getProperty(mQuery.parentProperty).toByteArray());
+    }
+    return qHash(QByteArray());
 }
 
 template<class T, class Ptr>
diff --git a/common/modelresult.h b/common/modelresult.h
index 40a9d9d..66dfce5 100644
--- a/common/modelresult.h
+++ b/common/modelresult.h
@@ -53,7 +53,7 @@ public:
     void setFetcher(const std::function<void(const Ptr &parent)> &fetcher);
 
 private:
-    static qint64 parentId(const Ptr &value);
+    qint64 parentId(const Ptr &value);
     QModelIndex createIndexFromId(const qint64 &id) const;
     void fetchEntities(const QModelIndex &parent);