Final change for certificate type filter