Added some extra filtering to CertificateAdmin