diff --git a/include/class.organization.php b/include/class.organization.php
index 10bd20294016509877c4e828fc5f9332aa729f79..785b6d36b489416b99c164efcb6f20865cc6f250 100644
--- a/include/class.organization.php
+++ b/include/class.organization.php
@@ -439,8 +439,8 @@ Filter::addSupportedMatches(/*@trans*/ 'Organization Data', function() {
         if (!$f->hasData())
             continue;
         $matches['field.'.$f->get('id')] = __('Organization').' / '.$f->getLabel();
-        if (($fi = $f->getImpl()) instanceof SelectionField) {
-            foreach ($fi->getList()->getProperties() as $p) {
+        if (($fi = $f->getImpl()) && $fi->hasSubFields()) {
+            foreach ($fi->getSubFields() as $p) {
                 $matches['field.'.$f->get('id').'.'.$p->get('id')]
                     = __('Organization').' / '.$f->getLabel().' / '.$p->getLabel();
             }