diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
index 593b021..eec754a 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/impl/DefaultOchPort.java
@@ -25,6 +25,7 @@
 import com.google.common.annotations.Beta;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.net.optical.device.OchPortHelper.stripHandledAnnotations;
 
 import java.util.Objects;
 
@@ -71,12 +72,9 @@
         return signalType.bitRate();
     }
 
-
     @Override
-    public Annotations annotations() {
-        // FIXME Filter OCh annotations, after confirming that
-        // it'll not result in information-loss
-        return super.annotations();
+    public Annotations unhandledAnnotations() {
+        return stripHandledAnnotations(super.annotations());
     }
 
     /**
@@ -140,6 +138,7 @@
                 .add("signalType", signalType())
                 .add("isTunable", isTunable())
                 .add("lambda", lambda())
+                .add("annotations", unhandledAnnotations())
                 .toString();
     }
 }