add visibility filtering on principals