=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java	2015-11-12 04:47:12 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/query/CriteriaQueryEngine.java	2015-11-16 02:27:15 +0000
@@ -181,7 +181,7 @@
                     {
                         Property property = query.getSchema().getProperty( restriction.getPath() );
 
-                        if ( property.isSimple() )
+                        if ( property.isSimple() && property.isPersisted() )
                         {
                             criterions.add( criterion );
                             criterionIterator.remove();