diff --git a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/orc/impl/ORCPublicCertificateDatabaseImpl.java b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/orc/impl/ORCPublicCertificateDatabaseImpl.java
index ac642fc5e6f..33c2c8a06ea 100755
--- a/java/com.sap.sailing.domain/src/com/sap/sailing/domain/orc/impl/ORCPublicCertificateDatabaseImpl.java
+++ b/java/com.sap.sailing.domain/src/com/sap/sailing/domain/orc/impl/ORCPublicCertificateDatabaseImpl.java
@@ -285,6 +285,7 @@ public class ORCPublicCertificateDatabaseImpl implements ORCPublicCertificateDat
                 for (int rowNodeIndex=0; rowNodeIndex<rowNodes.getLength(); rowNodeIndex++) {
                     final Node rowNode = rowNodes.item(rowNodeIndex);
                     if (rowNode.getNodeName().equals(ROW_ELEMENT)) {
+                        // TODO only include results that have <CanSelect>True</CanSelect> CERTIFICATE_IS_ACTIVE
                         result.add(parseHandle(rowNode));
                     }
                 }