TrustedSite Support

Resolve issues